From 730da15840c998319918da668defcf4a51410b12 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 28 Feb 2013 10:51:14 -0800 Subject: [PATCH 1/2] Avoid changing the C++ ABI with ssize_t. Bug: 8253769 Change-Id: Ia325003ed6e59da553e2bdde7c43515bc191b8ba --- libc/include/sys/types.h | 9 +++++++++ tests/stdio_test.cpp | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libc/include/sys/types.h b/libc/include/sys/types.h index 459159fe9..850e22ec5 100644 --- a/libc/include/sys/types.h +++ b/libc/include/sys/types.h @@ -85,8 +85,17 @@ typedef .... pthread_t; #ifndef _SSIZE_T_DEFINED_ #define _SSIZE_T_DEFINED_ +/* Traditionally, bionic's ssize_t was "long int". This causes GCC to emit warnings when you + * pass a ssize_t to a printf-style function. The correct type is __kernel_ssize_t, which is + * "int", which isn't an ABI change for C code (because they're the same size) but is an ABI + * change for C++ because "int" and "long int" mangle to "i" and "l" respectively. So until + * we can fix the ABI, this is the best we can do. http://b/8253769. */ +#if defined(__cplusplus) +typedef long int ssize_t; +#else typedef __kernel_ssize_t ssize_t; #endif +#endif typedef __kernel_suseconds_t suseconds_t; typedef __kernel_time_t time_t; diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp index d2311fd54..196c725aa 100644 --- a/tests/stdio_test.cpp +++ b/tests/stdio_test.cpp @@ -171,10 +171,17 @@ TEST(stdio, getline_invalid) { } TEST(stdio, printf_ssize_t) { - // We used to have a ssize_t definition that confused GCC into saying: +#if __BIONIC__ + // http://b/8253769 + ASSERT_EQ(sizeof(__kernel_ssize_t), sizeof(long int)); + ASSERT_EQ(sizeof(ssize_t), sizeof(long int)); +#else + // TODO: add a .c file so we can test this for bionic --- our C ssize_t is fine. + // For our 32-bit C++ ABI, we have a ssize_t definition that confuses GCC into saying: // error: format '%zd' expects argument of type 'signed size_t', // but argument 4 has type 'ssize_t {aka long int}' [-Werror=format] ssize_t v = 1; char buf[32]; snprintf(buf, sizeof(buf), "%zd", v); +#endif } From 744df77d4730cff99ac36f9761153620105dd9d7 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 14 Mar 2013 15:30:13 -0700 Subject: [PATCH 2/2] am 2e7b8d63: am f861bc5c: Merge "Don\'t search off the end of the index for bad Olson ids." * commit '2e7b8d6399fdea6e43dd07f353346324d2bf4ec4': Don't search off the end of the index for bad Olson ids. --- libc/tzcode/localtime.c | 8 +++++++- tests/Android.mk | 1 + tests/time_test.cpp | 44 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 tests/time_test.cpp diff --git a/libc/tzcode/localtime.c b/libc/tzcode/localtime.c index 689bbd318..8a54e81cc 100644 --- a/libc/tzcode/localtime.c +++ b/libc/tzcode/localtime.c @@ -2305,7 +2305,13 @@ static int __bionic_open_tzdata_path(const char* path, const char* olson_id, int static const size_t NAME_LENGTH = 40; unsigned char buf[NAME_LENGTH + 3 * sizeof(int32_t)]; - while (TEMP_FAILURE_RETRY(read(fd, buf, sizeof(buf))) == (ssize_t) sizeof(buf)) { + + size_t id_count = (ntohl(header.data_offset) - ntohl(header.index_offset)) / sizeof(buf); + for (size_t i = 0; i < id_count; ++i) { + if (TEMP_FAILURE_RETRY(read(fd, buf, sizeof(buf))) != (ssize_t) sizeof(buf)) { + break; + } + char this_id[NAME_LENGTH + 1]; memcpy(this_id, buf, NAME_LENGTH); this_id[NAME_LENGTH] = '\0'; diff --git a/tests/Android.mk b/tests/Android.mk index 633a6a991..46427ecea 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -74,6 +74,7 @@ test_src_files = \ string_test.cpp \ strings_test.cpp \ stubs_test.cpp \ + time_test.cpp \ unistd_test.cpp \ test_dynamic_ldflags = -Wl,--export-dynamic -Wl,-u,DlSymTestFunction diff --git a/tests/time_test.cpp b/tests/time_test.cpp new file mode 100644 index 000000000..9a5a70670 --- /dev/null +++ b/tests/time_test.cpp @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2013 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 +#include +#include + +#include + +#ifdef __BIONIC__ // mktime_tz is a bionic extension. +#include +TEST(time, mktime_tz) { + struct tm epoch; + memset(&epoch, 0, sizeof(tm)); + epoch.tm_year = 1970 - 1900; + epoch.tm_mon = 1; + epoch.tm_mday = 1; + + // Alphabetically first. Coincidentally equivalent to UTC. + ASSERT_EQ(2678400, mktime_tz(&epoch, "Africa/Abidjan")); + + // Alphabetically last. Coincidentally equivalent to UTC. + ASSERT_EQ(2678400, mktime_tz(&epoch, "Zulu")); + + // Somewhere in the middle, not UTC. + ASSERT_EQ(2707200, mktime_tz(&epoch, "America/Los_Angeles")); + + // Missing. Falls back to UTC. + ASSERT_EQ(2678400, mktime_tz(&epoch, "PST")); +} +#endif