Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit def8d6a7 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

The localtime_tz and mktime_tz extensions are now in bionic. 

(cherry-pick of d03072ff. This change
was originally committed to AOSP, is in internal master, but was somehow
lost from AOSP.)

Bug: 7012465

Conflicts:

	libcutils/Android.mk

Change-Id: I08ee8eb9b8ce5d3f9d8f2e67437d653e08697bc1
parent ef2ea99b

include/cutils/tztime.h

+1 −38
Original line number Diff line number Diff line
@@ -17,45 +17,8 @@ 
#ifndef _CUTILS_TZTIME_H

#define _CUTILS_TZTIME_H



#include <time.h>



#ifdef __cplusplus

extern "C" {

#endif



time_t mktime_tz(struct tm * const tmp, char const * tz);

void localtime_tz(const time_t * const timep, struct tm * tmp, const char* tz);



#ifdef HAVE_ANDROID_OS



/* the following is defined in the Bionic C library on Android, but the

 * declarations are only available through a platform-private header

 */

// TODO: fix both callers to just include <bionic_time.h> themselves.

#include <bionic_time.h>



#else /* !HAVE_ANDROID_OS */



struct strftime_locale {

    const char *mon[12];    /* short names */

    const char *month[12];  /* long names */

    const char *standalone_month[12];  /* long standalone names */

    const char *wday[7];    /* short names */

    const char *weekday[7]; /* long names */

    const char *X_fmt;

    const char *x_fmt;

    const char *c_fmt;

    const char *am;

    const char *pm;

    const char *date_fmt;

};



size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale *locale);



#endif /* !HAVE_ANDROID_OS */



#ifdef __cplusplus

}

#endif



#endif /* __CUTILS_TZTIME_H */

libcutils/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -77,12 +77,8 @@ else 
        abort_socket.c \

        fs.c \

        selector.c \

        tztime.c \

        multiuser.c \

        zygote.c



    commonHostSources += \

        tzstrftime.c

endif

libcutils/private.h

deleted100644 → 0
+0 −368
Original line number Diff line number Diff line 
#ifndef PRIVATE_H



#define PRIVATE_H



/*

** This file is in the public domain, so clarified as of

** 1996-06-05 by Arthur David Olson.

*/



/*

** This header is for use ONLY with the time conversion code.

** There is no guarantee that it will remain unchanged,

** or that it will remain at all.

** Do NOT copy it to any system include directory.

** Thank you!

*/



/*

** ID

*/



#ifndef lint

#ifndef NOID

static char	privatehid[] = "@(#)private.h	8.2";

#endif /* !defined NOID */

#endif /* !defined lint */



#define GRANDPARENTED	"Local time zone must be set--see zic manual page"



/*

** Defaults for preprocessor symbols.

** You can override these in your C compiler options, e.g. `-DHAVE_ADJTIME=0'.

*/



#ifndef HAVE_ADJTIME

#define HAVE_ADJTIME		1

#endif /* !defined HAVE_ADJTIME */



#ifndef HAVE_GETTEXT

#define HAVE_GETTEXT		0

#endif /* !defined HAVE_GETTEXT */



#ifndef HAVE_INCOMPATIBLE_CTIME_R

#define HAVE_INCOMPATIBLE_CTIME_R	0

#endif /* !defined INCOMPATIBLE_CTIME_R */



#ifndef HAVE_SETTIMEOFDAY

#define HAVE_SETTIMEOFDAY	3

#endif /* !defined HAVE_SETTIMEOFDAY */



#ifndef HAVE_STRERROR

#define HAVE_STRERROR		1

#endif /* !defined HAVE_STRERROR */



#ifndef HAVE_SYMLINK

#define HAVE_SYMLINK		1

#endif /* !defined HAVE_SYMLINK */



#ifndef HAVE_SYS_STAT_H

#define HAVE_SYS_STAT_H		1

#endif /* !defined HAVE_SYS_STAT_H */



#ifndef HAVE_SYS_WAIT_H

#define HAVE_SYS_WAIT_H		1

#endif /* !defined HAVE_SYS_WAIT_H */



#ifndef HAVE_UNISTD_H

#define HAVE_UNISTD_H		1

#endif /* !defined HAVE_UNISTD_H */



#ifndef HAVE_UTMPX_H

#define HAVE_UTMPX_H		0

#endif /* !defined HAVE_UTMPX_H */



#ifndef LOCALE_HOME

#define LOCALE_HOME		"/usr/lib/locale"

#endif /* !defined LOCALE_HOME */



#if HAVE_INCOMPATIBLE_CTIME_R

#define asctime_r _incompatible_asctime_r

#define ctime_r _incompatible_ctime_r

#endif /* HAVE_INCOMPATIBLE_CTIME_R */



/*

** Nested includes

*/



#include "sys/types.h"	/* for time_t */

#include "stdio.h"

#include "errno.h"

#include "string.h"

#include "limits.h"	/* for CHAR_BIT et al. */

#include "time.h"

#include "stdlib.h"



#if HAVE_GETTEXT

#include "libintl.h"

#endif /* HAVE_GETTEXT */



#if HAVE_SYS_WAIT_H

#include <sys/wait.h>	/* for WIFEXITED and WEXITSTATUS */

#endif /* HAVE_SYS_WAIT_H */



#ifndef WIFEXITED

#define WIFEXITED(status)	(((status) & 0xff) == 0)

#endif /* !defined WIFEXITED */

#ifndef WEXITSTATUS

#define WEXITSTATUS(status)	(((status) >> 8) & 0xff)

#endif /* !defined WEXITSTATUS */



#if HAVE_UNISTD_H

#include "unistd.h"	/* for F_OK and R_OK */

#endif /* HAVE_UNISTD_H */



#if !HAVE_UNISTD_H

#ifndef F_OK

#define F_OK	0

#endif /* !defined F_OK */

#ifndef R_OK

#define R_OK	4

#endif /* !defined R_OK */

#endif /* !HAVE_UNISTD_H */



/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */

#define is_digit(c) ((unsigned)(c) - '0' <= 9)



/*

** Define HAVE_STDINT_H's default value here, rather than at the

** start, since __GLIBC__'s value depends on previously-included

** files.

** (glibc 2.1 and later have stdint.h, even with pre-C99 compilers.)

*/

#ifndef HAVE_STDINT_H

#define HAVE_STDINT_H \

	(199901 <= __STDC_VERSION__ || \

	2 < (__GLIBC__ + (0 < __GLIBC_MINOR__)))

#endif /* !defined HAVE_STDINT_H */



#if HAVE_STDINT_H

#include "stdint.h"

#endif /* !HAVE_STDINT_H */



#ifndef INT_FAST64_MAX

/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX.  */

#if defined LLONG_MAX || defined __LONG_LONG_MAX__

typedef long long	int_fast64_t;

#else /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */

#if (LONG_MAX >> 31) < 0xffffffff

Please use a compiler that supports a 64-bit integer type (or wider);

you may need to compile with "-DHAVE_STDINT_H".

#endif /* (LONG_MAX >> 31) < 0xffffffff */

typedef long		int_fast64_t;

#endif /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */

#endif /* !defined INT_FAST64_MAX */



#ifndef INT32_MAX

#define INT32_MAX 0x7fffffff

#endif /* !defined INT32_MAX */

#ifndef INT32_MIN

#define INT32_MIN (-1 - INT32_MAX)

#endif /* !defined INT32_MIN */



/*

** Workarounds for compilers/systems.

*/



/*

** If your compiler lacks prototypes, "#define P(x) ()".

*/



#ifndef P

#define P(x)	x

#endif /* !defined P */



/*

** SunOS 4.1.1 headers lack EXIT_SUCCESS.

*/



#ifndef EXIT_SUCCESS

#define EXIT_SUCCESS	0

#endif /* !defined EXIT_SUCCESS */



/*

** SunOS 4.1.1 headers lack EXIT_FAILURE.

*/



#ifndef EXIT_FAILURE

#define EXIT_FAILURE	1

#endif /* !defined EXIT_FAILURE */



/*

** SunOS 4.1.1 headers lack FILENAME_MAX.

*/



#ifndef FILENAME_MAX



#ifndef MAXPATHLEN

#ifdef unix

#include "sys/param.h"

#endif /* defined unix */

#endif /* !defined MAXPATHLEN */



#ifdef MAXPATHLEN

#define FILENAME_MAX	MAXPATHLEN

#endif /* defined MAXPATHLEN */

#ifndef MAXPATHLEN

#define FILENAME_MAX	1024		/* Pure guesswork */

#endif /* !defined MAXPATHLEN */



#endif /* !defined FILENAME_MAX */



/*

** SunOS 4.1.1 libraries lack remove.

*/



#ifndef remove

extern int	unlink P((const char * filename));

#define remove	unlink

#endif /* !defined remove */



/*

** Some ancient errno.h implementations don't declare errno.

** But some newer errno.h implementations define it as a macro.

** Fix the former without affecting the latter.

*/



#ifndef errno

extern int errno;

#endif /* !defined errno */



/*

** Some time.h implementations don't declare asctime_r.

** Others might define it as a macro.

** Fix the former without affecting the latter.

*/



#ifndef asctime_r

extern char *	asctime_r();

#endif



/*

** Private function declarations.

*/



char *		icalloc P((int nelem, int elsize));

char *		icatalloc P((char * old, const char * new));

char *		icpyalloc P((const char * string));

char *		imalloc P((int n));

void *		irealloc P((void * pointer, int size));

void		icfree P((char * pointer));

void		ifree P((char * pointer));

const char *	scheck P((const char * string, const char * format));



/*

** Finally, some convenience items.

*/



#ifndef TRUE

#define TRUE	1

#endif /* !defined TRUE */



#ifndef FALSE

#define FALSE	0

#endif /* !defined FALSE */



#ifndef TYPE_BIT

#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)

#endif /* !defined TYPE_BIT */



#ifndef TYPE_SIGNED

#define TYPE_SIGNED(type) (((type) -1) < 0)

#endif /* !defined TYPE_SIGNED */



/*

** Since the definition of TYPE_INTEGRAL contains floating point numbers,

** it cannot be used in preprocessor directives.

*/



#ifndef TYPE_INTEGRAL

#define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5)

#endif /* !defined TYPE_INTEGRAL */



#ifndef INT_STRLEN_MAXIMUM

/*

** 302 / 1000 is log10(2.0) rounded up.

** Subtract one for the sign bit if the type is signed;

** add one for integer division truncation;

** add one more for a minus sign if the type is signed.

*/

#define INT_STRLEN_MAXIMUM(type) \

	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + \

	1 + TYPE_SIGNED(type))

#endif /* !defined INT_STRLEN_MAXIMUM */



/*

** INITIALIZE(x)

*/



#ifndef GNUC_or_lint

#ifdef lint

#define GNUC_or_lint

#endif /* defined lint */

#ifndef lint

#ifdef __GNUC__

#define GNUC_or_lint

#endif /* defined __GNUC__ */

#endif /* !defined lint */

#endif /* !defined GNUC_or_lint */



#ifndef INITIALIZE

#ifdef GNUC_or_lint

#define INITIALIZE(x)	((x) = 0)

#endif /* defined GNUC_or_lint */

#ifndef GNUC_or_lint

#define INITIALIZE(x)

#endif /* !defined GNUC_or_lint */

#endif /* !defined INITIALIZE */



/*

** For the benefit of GNU folk...

** `_(MSGID)' uses the current locale's message library string for MSGID.

** The default is to use gettext if available, and use MSGID otherwise.

*/



#ifndef _

#if HAVE_GETTEXT

#define _(msgid) gettext(msgid)

#else /* !HAVE_GETTEXT */

#define _(msgid) msgid

#endif /* !HAVE_GETTEXT */

#endif /* !defined _ */



#ifndef TZ_DOMAIN

#define TZ_DOMAIN "tz"

#endif /* !defined TZ_DOMAIN */



#if HAVE_INCOMPATIBLE_CTIME_R

#undef asctime_r

#undef ctime_r

char *asctime_r P((struct tm const *, char *));

char *ctime_r P((time_t const *, char *));

#endif /* HAVE_INCOMPATIBLE_CTIME_R */



#ifndef YEARSPERREPEAT

#define YEARSPERREPEAT		400	/* years before a Gregorian repeat */

#endif /* !defined YEARSPERREPEAT */



/*

** The Gregorian year averages 365.2425 days, which is 31556952 seconds.

*/



#ifndef AVGSECSPERYEAR

#define AVGSECSPERYEAR		31556952L

#endif /* !defined AVGSECSPERYEAR */



#ifndef SECSPERREPEAT

#define SECSPERREPEAT		((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR)

#endif /* !defined SECSPERREPEAT */

 

#ifndef SECSPERREPEAT_BITS

#define SECSPERREPEAT_BITS	34	/* ceil(log2(SECSPERREPEAT)) */

#endif /* !defined SECSPERREPEAT_BITS */



/*

** UNIX was a registered trademark of The Open Group in 2003.

*/



#endif /* !defined PRIVATE_H */

libcutils/tzfile.h

deleted100644 → 0
+0 −180
Original line number Diff line number Diff line 
#ifndef TZFILE_H



#define TZFILE_H



/*

** This file is in the public domain, so clarified as of

** 1996-06-05 by Arthur David Olson.

*/



/*

** This header is for use ONLY with the time conversion code.

** There is no guarantee that it will remain unchanged,

** or that it will remain at all.

** Do NOT copy it to any system include directory.

** Thank you!

*/



/*

** ID

*/



#ifndef lint

#ifndef NOID

static char	tzfilehid[] = "@(#)tzfile.h	8.1";

#endif /* !defined NOID */

#endif /* !defined lint */



/*

** Information about time zone files.

*/



#ifndef TZDIR

#define TZDIR "/usr/share/zoneinfo" /* "/android/usr/share/zoneinfo" */ /* Time zone object file directory */

#endif /* !defined TZDIR */



#ifndef TZDEFAULT

#define TZDEFAULT	"localtime"

#endif /* !defined TZDEFAULT */



#ifndef TZDEFRULES

#define TZDEFRULES	"posixrules"

#endif /* !defined TZDEFRULES */



/*

** Each file begins with. . .

*/



#define	TZ_MAGIC	"TZif"



struct tzhead {

	char	tzh_magic[4];		/* TZ_MAGIC */

	char	tzh_version[1];		/* '\0' or '2' as of 2005 */

	char	tzh_reserved[15];	/* reserved--must be zero */

	char	tzh_ttisgmtcnt[4];	/* coded number of trans. time flags */

	char	tzh_ttisstdcnt[4];	/* coded number of trans. time flags */

	char	tzh_leapcnt[4];		/* coded number of leap seconds */

	char	tzh_timecnt[4];		/* coded number of transition times */

	char	tzh_typecnt[4];		/* coded number of local time types */

	char	tzh_charcnt[4];		/* coded number of abbr. chars */

};



/*

** . . .followed by. . .

**

**	tzh_timecnt (char [4])s		coded transition times a la time(2)

**	tzh_timecnt (unsigned char)s	types of local time starting at above

**	tzh_typecnt repetitions of

**		one (char [4])		coded UTC offset in seconds

**		one (unsigned char)	used to set tm_isdst

**		one (unsigned char)	that's an abbreviation list index

**	tzh_charcnt (char)s		'\0'-terminated zone abbreviations

**	tzh_leapcnt repetitions of

**		one (char [4])		coded leap second transition times

**		one (char [4])		total correction after above

**	tzh_ttisstdcnt (char)s		indexed by type; if TRUE, transition

**					time is standard time, if FALSE,

**					transition time is wall clock time

**					if absent, transition times are

**					assumed to be wall clock time

**	tzh_ttisgmtcnt (char)s		indexed by type; if TRUE, transition

**					time is UTC, if FALSE,

**					transition time is local time

**					if absent, transition times are

**					assumed to be local time

*/



/*

** If tzh_version is '2' or greater, the above is followed by a second instance

** of tzhead and a second instance of the data in which each coded transition

** time uses 8 rather than 4 chars,

** then a POSIX-TZ-environment-variable-style string for use in handling

** instants after the last transition time stored in the file

** (with nothing between the newlines if there is no POSIX representation for

** such instants).

*/



/*

** In the current implementation, "tzset()" refuses to deal with files that

** exceed any of the limits below.

*/



#ifndef TZ_MAX_TIMES

#define TZ_MAX_TIMES	1200

#endif /* !defined TZ_MAX_TIMES */



#ifndef TZ_MAX_TYPES

#ifndef NOSOLAR

#define TZ_MAX_TYPES	256 /* Limited by what (unsigned char)'s can hold */

#endif /* !defined NOSOLAR */

#ifdef NOSOLAR

/*

** Must be at least 14 for Europe/Riga as of Jan 12 1995,

** as noted by Earl Chew.

*/

#define TZ_MAX_TYPES	20	/* Maximum number of local time types */

#endif /* !defined NOSOLAR */

#endif /* !defined TZ_MAX_TYPES */



#ifndef TZ_MAX_CHARS

#define TZ_MAX_CHARS	50	/* Maximum number of abbreviation characters */

				/* (limited by what unsigned chars can hold) */

#endif /* !defined TZ_MAX_CHARS */



#ifndef TZ_MAX_LEAPS

#define TZ_MAX_LEAPS	50	/* Maximum number of leap second corrections */

#endif /* !defined TZ_MAX_LEAPS */



#define SECSPERMIN	60

#define MINSPERHOUR	60

#define HOURSPERDAY	24

#define DAYSPERWEEK	7

#define DAYSPERNYEAR	365

#define DAYSPERLYEAR	366

#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)

#define SECSPERDAY	((long) SECSPERHOUR * HOURSPERDAY)

#define MONSPERYEAR	12



#define TM_SUNDAY	0

#define TM_MONDAY	1

#define TM_TUESDAY	2

#define TM_WEDNESDAY	3

#define TM_THURSDAY	4

#define TM_FRIDAY	5

#define TM_SATURDAY	6



#define TM_JANUARY	0

#define TM_FEBRUARY	1

#define TM_MARCH	2

#define TM_APRIL	3

#define TM_MAY		4

#define TM_JUNE		5

#define TM_JULY		6

#define TM_AUGUST	7

#define TM_SEPTEMBER	8

#define TM_OCTOBER	9

#define TM_NOVEMBER	10

#define TM_DECEMBER	11



#define TM_YEAR_BASE	1900



#define EPOCH_YEAR	1970

#define EPOCH_WDAY	TM_THURSDAY



#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))



/*

** Since everything in isleap is modulo 400 (or a factor of 400), we know that

**	isleap(y) == isleap(y % 400)

** and so

**	isleap(a + b) == isleap((a + b) % 400)

** or

**	isleap(a + b) == isleap(a % 400 + b % 400)

** This is true even if % means modulo rather than Fortran remainder

** (which is allowed by C89 but not C99).

** We use this to avoid addition overflow problems.

*/



#define isleap_sum(a, b)	isleap((a) % 400 + (b) % 400)



#endif /* !defined TZFILE_H */