octave-shane/gnulib-hg: lib/strftime.c annotate

annotate lib/strftime.c @ 6062:af9525e258c2

Make the %s format (seconds since the epoch) work for a negative number and when used with a zero-padded field width, e.g. %015s. (my_strftime): Move the `do_number_sign_and_padding' label so that it precedes the code to set `digits'. Otherwise, %0Ns wouldn't work. Before this change, `date -d @-22 +%05s' would print `00-22'. Now, it prints `-0022', as it should.

author	Jim Meyering <jim@meyering.net>
date	Fri, 19 Aug 2005 09:21:57 +0000
parents	2a0d593683dc
children	52428341346b

rev	line source
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1 /* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005 Free Software
5402 afb82efdf199 (DO_MULTIBYTE): Check for wchar.h, too. Paul Eggert <eggert@cs.ucla.edu> parents: 4759 diff changeset	2 Foundation, Inc.
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	3
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	4 NOTE: The canonical source of this file is maintained with the GNU C Library.
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	5 Bugs can be reported to bug-glibc@prep.ai.mit.edu.
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	6
4422 d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	7 This program is free software; you can redistribute it and/or modify
d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	8 it under the terms of the GNU General Public License as published by
d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	9 the Free Software Foundation; either version 2, or (at your option)
d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	10 any later version.
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	11
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	12 This program is distributed in the hope that it will be useful,
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	13 but WITHOUT ANY WARRANTY; without even the implied warranty of
4422 d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	15 GNU General Public License for more details.
782 70c419102365 Fix copyright. Jim Meyering <jim@meyering.net> parents: 726 diff changeset	16
4422 d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	17 You should have received a copy of the GNU General Public License along
d82316ffe803 Switch from LGPL to GPL. Paul Eggert <eggert@cs.ucla.edu> parents: 4318 diff changeset	18 with this program; if not, write to the Free Software Foundation,
5848 a48fb0e98c8c * empty log message * Paul Eggert <eggert@cs.ucla.edu> parents: 5775 diff changeset	19 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	20
125 539738c0b6c2 merge with 1.8.1d Jim Meyering <jim@meyering.net> parents: 101 diff changeset	21 #ifdef HAVE_CONFIG_H
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	22 # include <config.h>
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	23 #endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	24
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	25 #ifdef _LIBC
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	26 # define HAVE_MBLEN 1
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	27 # define HAVE_MBRLEN 1
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	28 # define HAVE_STRUCT_ERA_ENTRY 1
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	29 # define HAVE_TM_GMTOFF 1
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	30 # define HAVE_TM_ZONE 1
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	31 # define HAVE_TZNAME 1
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	32 # define HAVE_TZSET 1
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	33 # define MULTIBYTE_IS_FORMAT_SAFE 1
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	34 # include "../locale/localeinfo.h"
125 539738c0b6c2 merge with 1.8.1d Jim Meyering <jim@meyering.net> parents: 101 diff changeset	35 #endif
539738c0b6c2 merge with 1.8.1d Jim Meyering <jim@meyering.net> parents: 101 diff changeset	36
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	37 #include <ctype.h>
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	38 #include <sys/types.h> /* Some systems define `time_t' here. */
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	39
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	40 #ifdef TIME_WITH_SYS_TIME
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	41 # include <sys/time.h>
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	42 # include <time.h>
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	43 #else
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	44 # ifdef HAVE_SYS_TIME_H
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	45 # include <sys/time.h>
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	46 # else
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	47 # include <time.h>
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	48 # endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	49 #endif
803 ff62201579ac revert last change. Jim Meyering <jim@meyering.net> parents: 802 diff changeset	50 #if HAVE_TZNAME
801 da8cea3a8036 [HAVE_TZNAME]: Declare tzname. Jim Meyering <jim@meyering.net> parents: 797 diff changeset	51 extern char *tzname[];
da8cea3a8036 [HAVE_TZNAME]: Declare tzname. Jim Meyering <jim@meyering.net> parents: 797 diff changeset	52 #endif
da8cea3a8036 [HAVE_TZNAME]: Declare tzname. Jim Meyering <jim@meyering.net> parents: 797 diff changeset	53
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	54 /* Do multibyte processing if multibytes are supported, unless
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	55 multibyte sequences are safe in formats. Multibyte sequences are
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	56 safe if they cannot contain byte sequences that look like format
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	57 conversion specifications. The GNU C Library uses UTF8 multibyte
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	58 encoding, which is safe for formats, but strftime.c can be used
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	59 with other C libraries that use unsafe encodings. */
5402 afb82efdf199 (DO_MULTIBYTE): Check for wchar.h, too. Paul Eggert <eggert@cs.ucla.edu> parents: 4759 diff changeset	60 #define DO_MULTIBYTE (HAVE_MBLEN && HAVE_WCHAR_H && ! MULTIBYTE_IS_FORMAT_SAFE)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	61
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	62 #if DO_MULTIBYTE
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	63 # if HAVE_MBRLEN
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	64 # include <wchar.h>
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	65 # else
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	66 /* Simulate mbrlen with mblen as best we can. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	67 # define mbstate_t int
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	68 # define mbrlen(s, n, ps) mblen (s, n)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	69 # define mbsinit(ps) (*(ps) == 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	70 # endif
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	71 static const mbstate_t mbstate_zero;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	72 #endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	73
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	74 #include <limits.h>
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	75 #include <stdbool.h>
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	76 #include <stddef.h>
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	77 #include <stdlib.h>
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	78 #include <string.h>
176 10b9f9091b11 . Jim Meyering <jim@meyering.net> parents: 125 diff changeset	79
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	80 #ifdef COMPILE_WIDE
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	81 # include <endian.h>
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	82 # define CHAR_T wchar_t
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	83 # define UCHAR_T unsigned int
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	84 # define L_(Str) L##Str
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	85 # define NLW(Sym) _NL_W##Sym
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	86
2845 d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	87 # define MEMCPY(d, s, n) __wmemcpy (d, s, n)
d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	88 # define STRLEN(s) __wcslen (s)
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	89
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	90 #else
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	91 # define CHAR_T char
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	92 # define UCHAR_T unsigned char
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	93 # define L_(Str) Str
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	94 # define NLW(Sym) Sym
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	95
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	96 # define MEMCPY(d, s, n) memcpy (d, s, n)
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	97 # define STRLEN(s) strlen (s)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	98
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	99 # ifdef _LIBC
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	100 # define MEMPCPY(d, s, n) __mempcpy (d, s, n)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	101 # else
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	102 # ifndef HAVE_MEMPCPY
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	103 # define MEMPCPY(d, s, n) ((void ) ((char ) memcpy (d, s, n) + (n)))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	104 # endif
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	105 # endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	106 #endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	107
5414 1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	108 /* Shift A right by B bits portably, by dividing A by 2**B and
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	109 truncating towards minus infinity. A and B should be free of side
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	110 effects, and B should be in the range 0 <= B <= INT_BITS - 2, where
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	111 INT_BITS is the number of useful bits in an int. GNU code can
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	112 assume that INT_BITS is at least 32.
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	113
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	114 ISO C99 says that A >> B is implementation-defined if A < 0. Some
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	115 implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	116 right in the usual way when A < 0, so SHR falls back on division if
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	117 ordinary A >> B doesn't seem to be the usual signed shift. */
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	118 #define SHR(a, b) \
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	119 (-1 >> 1 == -1 \
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	120 ? (a) >> (b) \
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	121 : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0))
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	122
5775 73ab05626d30 Propagate intprops.h comment fixes to mktime.c and strftime.c. Paul Eggert <eggert@cs.ucla.edu> parents: 5714 diff changeset	123 /* Bound on length of the string representing an integer type or expression T.
5691 ec62790f0938 Factor int-properties macros into a single file, except for Paul Eggert <eggert@cs.ucla.edu> parents: 5690 diff changeset	124 Subtract 1 for the sign bit if t is signed; log10 (2.0) < 146/485;
ec62790f0938 Factor int-properties macros into a single file, except for Paul Eggert <eggert@cs.ucla.edu> parents: 5690 diff changeset	125 add 1 for integer division truncation; add 1 more for a minus sign
ec62790f0938 Factor int-properties macros into a single file, except for Paul Eggert <eggert@cs.ucla.edu> parents: 5690 diff changeset	126 if needed. */
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	127 #define INT_STRLEN_BOUND(t) \
5691 ec62790f0938 Factor int-properties macros into a single file, except for Paul Eggert <eggert@cs.ucla.edu> parents: 5690 diff changeset	128 ((sizeof (t) * CHAR_BIT - 1) * 146 / 485 + 2)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	129
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	130 #define TM_YEAR_BASE 1900
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	131
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	132 #ifndef __isleap
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	133 /* Nonzero if YEAR is a leap year (every 4 years,
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	134 except every 100th isn't, and every 400th is). */
817 91a2ff2f432c run cpp-indent Jim Meyering <jim@meyering.net> parents: 816 diff changeset	135 # define __isleap(year) \
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	136 ((year) % 4 == 0 && ((year) % 100 != 0 \|\| (year) % 400 == 0))
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	137 #endif
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	138
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	139
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	140 #ifdef _LIBC
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	141 # define tzname __tzname
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	142 # define tzset __tzset
4621 3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	143 #endif
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	144
4621 3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	145 #if !HAVE_TM_GMTOFF
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	146 /* Portable standalone applications should supply a "time_r.h" that
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	147 declares a POSIX-compliant localtime_r, for the benefit of older
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	148 implementations that lack localtime_r or have a nonstandard one.
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	149 See the gnulib time_r module for one way to implement this. */
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	150 # include "time_r.h"
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	151 # undef __gmtime_r
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	152 # undef __localtime_r
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	153 # define __gmtime_r gmtime_r
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	154 # define __localtime_r localtime_r
3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	155 #endif
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	156
f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	157
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	158 #ifdef COMPILE_WIDE
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	159 # define memset_space(P, Len) (wmemset (P, L' ', Len), (P) += (Len))
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	160 # define memset_zero(P, Len) (wmemset (P, L'0', Len), (P) += (Len))
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	161 #else
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	162 # define memset_space(P, Len) (memset (P, ' ', Len), (P) += (Len))
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	163 # define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	164 #endif
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	165
930 589c196817a6 correct/normalize indentation in cpp directives Jim Meyering <jim@meyering.net> parents: 929 diff changeset	166 #define add(n, f) \
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	167 do \
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	168 { \
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	169 int _n = (n); \
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	170 int _delta = width - _n; \
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	171 int _incr = _n + (_delta > 0 ? _delta : 0); \
4298 374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	172 if ((size_t) _incr >= maxsize - i) \
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	173 return 0; \
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	174 if (p) \
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	175 { \
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	176 if (_delta > 0) \
929 f655d8ee4cd7 update from FSF Jim Meyering <jim@meyering.net> parents: 866 diff changeset	177 { \
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	178 if (pad == L_('0')) \
929 f655d8ee4cd7 update from FSF Jim Meyering <jim@meyering.net> parents: 866 diff changeset	179 memset_zero (p, _delta); \
f655d8ee4cd7 update from FSF Jim Meyering <jim@meyering.net> parents: 866 diff changeset	180 else \
f655d8ee4cd7 update from FSF Jim Meyering <jim@meyering.net> parents: 866 diff changeset	181 memset_space (p, _delta); \
f655d8ee4cd7 update from FSF Jim Meyering <jim@meyering.net> parents: 866 diff changeset	182 } \
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	183 f; \
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	184 p += _n; \
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	185 } \
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	186 i += _incr; \
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	187 } while (0)
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	188
930 589c196817a6 correct/normalize indentation in cpp directives Jim Meyering <jim@meyering.net> parents: 929 diff changeset	189 #define cpy(n, s) \
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	190 add ((n), \
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	191 if (to_lowcase) \
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	192 memcpy_lowcase (p, (s), _n LOCALE_ARG); \
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	193 else if (to_uppcase) \
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	194 memcpy_uppcase (p, (s), _n LOCALE_ARG); \
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	195 else \
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	196 MEMCPY ((void ) p, (void const ) (s), _n))
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	197
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	198 #ifdef COMPILE_WIDE
4297 30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	199 # ifndef USE_IN_EXTENDED_LOCALE_MODEL
30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	200 # undef __mbsrtowcs_l
30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	201 # define __mbsrtowcs_l(d, s, l, st, loc) __mbsrtowcs (d, s, l, st)
30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	202 # endif
30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	203 # define widen(os, ws, l) \
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	204 { \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	205 mbstate_t __st; \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	206 const char *__s = os; \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	207 memset (&__st, '\0', sizeof (__st)); \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	208 l = __mbsrtowcs_l (NULL, &__s, 0, &__st, loc); \
4300 e6877ea7c8a8 (widen): Cast alloca return value to proper type. Jim Meyering <jim@meyering.net> parents: 4298 diff changeset	209 ws = (wchar_t ) alloca ((l + 1) sizeof (wchar_t)); \
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	210 (void) __mbsrtowcs_l (ws, &__s, l, &__st, loc); \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	211 }
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	212 #endif
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	213
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	214
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	215 #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	216 /* We use this code also for the extended locale handling where the
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	217 function gets as an additional argument the locale which has to be
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	218 used. To access the values we have to redefine the _NL_CURRENT
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	219 macro. */
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	220 # define strftime __strftime_l
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	221 # define wcsftime __wcsftime_l
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	222 # undef _NL_CURRENT
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	223 # define _NL_CURRENT(category, item) \
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	224 (current->values[_NL_ITEM_INDEX (item)].string)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	225 # define LOCALE_ARG , loc
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	226 # define LOCALE_PARAM_PROTO , __locale_t loc
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	227 # define HELPER_LOCALE_ARG , current
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	228 #else
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	229 # define LOCALE_PARAM_PROTO
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	230 # define LOCALE_ARG
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	231 # ifdef _LIBC
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	232 # define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	233 # else
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	234 # define HELPER_LOCALE_ARG
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	235 # endif
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	236 #endif
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	237
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	238 #ifdef COMPILE_WIDE
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	239 # ifdef USE_IN_EXTENDED_LOCALE_MODEL
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	240 # define TOUPPER(Ch, L) __towupper_l (Ch, L)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	241 # define TOLOWER(Ch, L) __towlower_l (Ch, L)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	242 # else
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	243 # define TOUPPER(Ch, L) towupper (Ch)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	244 # define TOLOWER(Ch, L) towlower (Ch)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	245 # endif
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	246 #else
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	247 # ifdef _LIBC
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	248 # ifdef USE_IN_EXTENDED_LOCALE_MODEL
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	249 # define TOUPPER(Ch, L) __toupper_l (Ch, L)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	250 # define TOLOWER(Ch, L) __tolower_l (Ch, L)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	251 # else
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	252 # define TOUPPER(Ch, L) toupper (Ch)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	253 # define TOLOWER(Ch, L) tolower (Ch)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	254 # endif
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	255 # else
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	256 # define TOUPPER(Ch, L) (islower (Ch) ? toupper (Ch) : (Ch))
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	257 # define TOLOWER(Ch, L) (isupper (Ch) ? tolower (Ch) : (Ch))
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	258 # endif
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	259 #endif
819 2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	260 /* We don't use `isdigit' here since the locale dependent
2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	261 interpretation is not what we want here. We only need to accept
2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	262 the arabic digits in the ASCII range. One day there is perhaps a
2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	263 more reliable way to accept other sets of digits. */
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	264 #define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	265
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	266 static CHAR_T *
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	267 memcpy_lowcase (CHAR_T dest, const CHAR_T src,
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	268 size_t len LOCALE_PARAM_PROTO)
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	269 {
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	270 while (len-- > 0)
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	271 dest[len] = TOLOWER ((UCHAR_T) src[len], loc);
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	272 return dest;
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	273 }
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	274
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	275 static CHAR_T *
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	276 memcpy_uppcase (CHAR_T dest, const CHAR_T src,
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	277 size_t len LOCALE_PARAM_PROTO)
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	278 {
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	279 while (len-- > 0)
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	280 dest[len] = TOUPPER ((UCHAR_T) src[len], loc);
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	281 return dest;
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	282 }
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	283
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	284
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	285 #if ! HAVE_TM_GMTOFF
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	286 /* Yield the difference between A and B,
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	287 measured in seconds, ignoring leap seconds. */
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	288 # define tm_diff ftime_tm_diff
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	289 static int
4759 27c6099e6a9f * strftime.c (tm_diff) [! HAVE_TM_GMTOFF]: Fix arg typo in previous patch. Paul Eggert <eggert@cs.ucla.edu> parents: 4693 diff changeset	290 tm_diff (const struct tm a, const struct tm b)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	291 {
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	292 /* Compute intervening leap days correctly even if year is negative.
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	293 Take care to avoid int overflow in leap day calculations,
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	294 but it's OK to assume that A and B are close to each other. */
5414 1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	295 int a4 = SHR (a->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (a->tm_year & 3);
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	296 int b4 = SHR (b->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (b->tm_year & 3);
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	297 int a100 = a4 / 25 - (a4 % 25 < 0);
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	298 int b100 = b4 / 25 - (b4 % 25 < 0);
5414 1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	299 int a400 = SHR (a100, 2);
1b5e702ecdd1 (SHR): New macro, which is a portable Paul Eggert <eggert@cs.ucla.edu> parents: 5402 diff changeset	300 int b400 = SHR (b100, 2);
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	301 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	302 int years = a->tm_year - b->tm_year;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	303 int days = (365 * years + intervening_leap_days
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	304 + (a->tm_yday - b->tm_yday));
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	305 return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	306 + (a->tm_min - b->tm_min))
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	307 + (a->tm_sec - b->tm_sec));
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	308 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	309 #endif /* ! HAVE_TM_GMTOFF */
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	310
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	311
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	312
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	313 /* The number of days from the first day of the first ISO week of this
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	314 year to the year day YDAY with week day WDAY. ISO weeks start on
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	315 Monday; the first ISO week has the year's first Thursday. YDAY may
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	316 be as small as YDAY_MINIMUM. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	317 #define ISO_WEEK_START_WDAY 1 /* Monday */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	318 #define ISO_WEEK1_WDAY 4 /* Thursday */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	319 #define YDAY_MINIMUM (-366)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	320 #ifdef __GNUC__
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	321 __inline__
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	322 #endif
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	323 static int
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	324 iso_week_days (int yday, int wday)
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	325 {
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	326 /* Add enough to the first operand of % to make it nonnegative. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	327 int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	328 return (yday
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	329 - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	330 + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	331 }
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	332
f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	333
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	334 #if !(defined _NL_CURRENT \|\| HAVE_STRFTIME)
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	335 static CHAR_T const weekday_name[][10] =
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	336 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	337 L_("Sunday"), L_("Monday"), L_("Tuesday"), L_("Wednesday"),
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	338 L_("Thursday"), L_("Friday"), L_("Saturday")
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	339 };
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	340 static CHAR_T const month_name[][10] =
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	341 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	342 L_("January"), L_("February"), L_("March"), L_("April"), L_("May"),
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	343 L_("June"), L_("July"), L_("August"), L_("September"), L_("October"),
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	344 L_("November"), L_("December")
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	345 };
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	346 #endif
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	347
860 68da68da125e (_strftime_copytm): New function, to work around Solaris 2.5 tzset bug. Jim Meyering <jim@meyering.net> parents: 829 diff changeset	348
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	349 /* When compiling this file, GNU applications can #define my_strftime
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	350 to a symbol (typically nstrftime) to get an extended strftime with
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	351 extra arguments UT and NS. Emacs is a special case for now, but
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	352 this Emacs-specific code can be removed once Emacs's config.h
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	353 defines my_strftime. */
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	354 #if defined emacs && !defined my_strftime
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	355 # define my_strftime nstrftime
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	356 #endif
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	357
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	358 #ifdef my_strftime
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	359 # define extra_args , ut, ns
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	360 # define extra_args_spec , int ut, int ns
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	361 #else
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	362 # ifdef COMPILE_WIDE
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	363 # define my_strftime wcsftime
4297 30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	364 # define nl_get_alt_digit _nl_get_walt_digit
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	365 # else
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	366 # define my_strftime strftime
4297 30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	367 # define nl_get_alt_digit _nl_get_alt_digit
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	368 # endif
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	369 # define extra_args
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	370 # define extra_args_spec
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	371 /* We don't have this information in general. */
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	372 # define ut 0
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	373 # define ns 0
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	374 #endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	375
860 68da68da125e (_strftime_copytm): New function, to work around Solaris 2.5 tzset bug. Jim Meyering <jim@meyering.net> parents: 829 diff changeset	376
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	377 /* Write information from TP into S according to the format
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	378 string FORMAT, writing no more that MAXSIZE characters
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	379 (including the terminating '\0') and returning number of
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	380 characters written. If S is NULL, nothing will be written
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	381 anywhere, so to determine how many characters would be
5711 ea764738a776 (my_strftime): Prepend space to format so that we can Paul Eggert <eggert@cs.ucla.edu> parents: 5701 diff changeset	382 written, use NULL for S and (size_t) -1 for MAXSIZE. */
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	383 size_t
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	384 my_strftime (CHAR_T s, size_t maxsize, const CHAR_T format,
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	385 const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO)
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	386 {
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	387 #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	388 struct locale_data *const current = loc->__locales[LC_TIME];
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	389 #endif
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	390
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	391 int hour12 = tp->tm_hour;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	392 #ifdef _NL_CURRENT
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	393 /* We cannot make the following values variables since we must delay
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	394 the evaluation of these values until really needed since some
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	395 expressions might not be valid in every situation. The `struct tm'
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	396 might be generated by a strptime() call that initialized
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	397 only a few elements. Dereference the pointers only if the format
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	398 requires this. Then it is ok to fail if the pointers are invalid. */
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	399 # define a_wkday \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	400 ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	401 # define f_wkday \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	402 ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	403 # define a_month \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	404 ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	405 # define f_month \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	406 ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	407 # define ampm \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	408 ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	409 ? NLW(PM_STR) : NLW(AM_STR)))
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	410
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	411 # define aw_len STRLEN (a_wkday)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	412 # define am_len STRLEN (a_month)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	413 # define ap_len STRLEN (ampm)
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	414 #else
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	415 # if !HAVE_STRFTIME
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	416 # define f_wkday (weekday_name[tp->tm_wday])
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	417 # define f_month (month_name[tp->tm_mon])
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	418 # define a_wkday f_wkday
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	419 # define a_month f_month
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	420 # define ampm (L_("AMPM") + 2 * (tp->tm_hour > 11))
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	421
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	422 size_t aw_len = 3;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	423 size_t am_len = 3;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	424 size_t ap_len = 2;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	425 # endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	426 #endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	427 const char *zone;
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	428 size_t i = 0;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	429 CHAR_T *p = s;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	430 const CHAR_T *f;
2993 9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	431 #if DO_MULTIBYTE && !defined COMPILE_WIDE
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	432 const char *format_end = NULL;
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	433 #endif
582 3ec26150a8d6 (mon_week_ISO): New function to implement new %V format. Jim Meyering <jim@meyering.net> parents: 581 diff changeset	434
5960 2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	435 #if ! defined _LIBC && ! HAVE_RUN_TZSET_TEST
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	436 /* Solaris 2.5.x and 2.6 tzset sometimes modify the storage returned
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	437 by localtime. On such systems, we must either use the tzset and
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	438 localtime wrappers to work around the bug (which sets
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	439 HAVE_RUN_TZSET_TEST) or make a copy of the structure. */
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	440 struct tm copy = *tp;
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	441 tp = ©
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	442 #endif
2a0d593683dc Remove the dependency of the strftime module on the tzset module. Paul Eggert <eggert@cs.ucla.edu> parents: 5848 diff changeset	443
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	444 zone = NULL;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	445 #if HAVE_TM_ZONE
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	446 /* The POSIX test suite assumes that setting
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	447 the environment variable TZ to a new value before calling strftime()
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	448 will influence the result (the %Z format) even if the information in
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	449 TP is computed with a totally different time zone.
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	450 This is bogus: though POSIX allows bad behavior like this,
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	451 POSIX does not require it. Do the right thing instead. */
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	452 zone = (const char *) tp->tm_zone;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	453 #endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	454 #if HAVE_TZNAME
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	455 if (ut)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	456 {
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	457 if (! (zone && *zone))
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	458 zone = "GMT";
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	459 }
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	460 else
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	461 {
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	462 /* POSIX.1 requires that local time zone information be used as
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	463 though strftime called tzset. */
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	464 # if HAVE_TZSET
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	465 tzset ();
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	466 # endif
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	467 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	468 #endif
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	469
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	470 if (hour12 > 12)
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	471 hour12 -= 12;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	472 else
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	473 if (hour12 == 0)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	474 hour12 = 12;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	475
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	476 for (f = format; *f != '\0'; ++f)
582 3ec26150a8d6 (mon_week_ISO): New function to implement new %V format. Jim Meyering <jim@meyering.net> parents: 581 diff changeset	477 {
1334 2139187e171f tweak from FSF Jim Meyering <jim@meyering.net> parents: 1126 diff changeset	478 int pad = 0; /* Padding for number ('-', '_', or 0). */
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	479 int modifier; /* Field modifier ('E', 'O', or 0). */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	480 int digits; /* Max digits for numeric format. */
4558 e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	481 int number_value; /* Numeric value to be printed. */
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	482 unsigned int u_number_value; /* (unsigned int) number_value. */
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	483 bool negative_number; /* 1 if the number is negative. */
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	484 const CHAR_T *subfmt;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	485 CHAR_T *bufp;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	486 CHAR_T buf[1 + (sizeof (int) < sizeof (time_t)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	487 ? INT_STRLEN_BOUND (time_t)
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	488 : INT_STRLEN_BOUND (int))];
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	489 int width = -1;
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	490 bool to_lowcase = false;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	491 bool to_uppcase = false;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	492 bool change_case = false;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	493 int format_char;
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	494
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	495 #if DO_MULTIBYTE && !defined COMPILE_WIDE
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	496 switch (*f)
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	497 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	498 case L_('%'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	499 break;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	500
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	501 case L_('\b'): case L_('\t'): case L_('\n'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	502 case L_('\v'): case L_('\f'): case L_('\r'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	503 case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	504 case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	505 case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	506 case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	507 case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	508 case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	509 case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	510 case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	511 case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	512 case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	513 case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	514 case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	515 case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	516 case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	517 case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	518 case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	519 case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	520 case L_('y'): case L_('z'): case L_('{'): case L_('\|'): case L_('}'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	521 case L_('~'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	522 /* The C Standard requires these 98 characters (plus '%') to
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	523 be in the basic execution character set. None of these
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	524 characters can start a multibyte sequence, so they need
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	525 not be analyzed further. */
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	526 add (1, p = f);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	527 continue;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	528
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	529 default:
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	530 /* Copy this multibyte sequence until we reach its end, find
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	531 an error, or come back to the initial shift state. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	532 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	533 mbstate_t mbstate = mbstate_zero;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	534 size_t len = 0;
2993 9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	535 size_t fsize;
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	536
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	537 if (! format_end)
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	538 format_end = f + strlen (f) + 1;
9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	539 fsize = format_end - f;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	540
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	541 do
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	542 {
2993 9231fb44e77d (my_strftime): Do not invoke mbrlen with a Jim Meyering <jim@meyering.net> parents: 2923 diff changeset	543 size_t bytes = mbrlen (f + len, fsize - len, &mbstate);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	544
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	545 if (bytes == 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	546 break;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	547
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	548 if (bytes == (size_t) -2)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	549 {
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	550 len += strlen (f + len);
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	551 break;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	552 }
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	553
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	554 if (bytes == (size_t) -1)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	555 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	556 len++;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	557 break;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	558 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	559
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	560 len += bytes;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	561 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	562 while (! mbsinit (&mbstate));
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	563
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	564 cpy (len, f);
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	565 f += len - 1;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	566 continue;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	567 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	568 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	569
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	570 #else /* ! DO_MULTIBYTE */
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	571
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	572 /* Either multibyte encodings are not supported, they are
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	573 safe for formats, so any non-'%' byte can be copied through,
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	574 or this is the wide character version. */
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	575 if (*f != L_('%'))
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	576 {
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	577 add (1, p = f);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	578 continue;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	579 }
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	580
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	581 #endif /* ! DO_MULTIBYTE */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	582
829 ab038dc4414d update from GNU libc Jim Meyering <jim@meyering.net> parents: 819 diff changeset	583 /* Check for flags that can modify a format. */
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	584 while (1)
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	585 {
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	586 switch (*++f)
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	587 {
829 ab038dc4414d update from GNU libc Jim Meyering <jim@meyering.net> parents: 819 diff changeset	588 /* This influences the number formats. */
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	589 case L_('_'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	590 case L_('-'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	591 case L_('0'):
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	592 pad = *f;
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	593 continue;
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	594
829 ab038dc4414d update from GNU libc Jim Meyering <jim@meyering.net> parents: 819 diff changeset	595 /* This changes textual output. */
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	596 case L_('^'):
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	597 to_uppcase = true;
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	598 continue;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	599 case L_('#'):
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	600 change_case = true;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	601 continue;
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	602
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	603 default:
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	604 break;
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	605 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	606 break;
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	607 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	608
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	609 /* As a GNU extension we allow to specify the field width. */
819 2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	610 if (ISDIGIT (*f))
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	611 {
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	612 width = 0;
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	613 do
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	614 {
4298 374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	615 if (width > INT_MAX / 10
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	616 \|\| (width == INT_MAX / 10 && *f - L_('0') > INT_MAX % 10))
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	617 /* Avoid overflow. */
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	618 width = INT_MAX;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	619 else
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	620 {
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	621 width *= 10;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	622 width += *f - L_('0');
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	623 }
819 2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	624 ++f;
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	625 }
819 2e3ead41ade2 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 817 diff changeset	626 while (ISDIGIT (*f));
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	627 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	628
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	629 /* Check for modifiers. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	630 switch (*f)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	631 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	632 case L_('E'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	633 case L_('O'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	634 modifier = *f++;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	635 break;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	636
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	637 default:
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	638 modifier = 0;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	639 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	640 }
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	641
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	642 /* Now do the specified format. */
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	643 format_char = *f;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	644 switch (format_char)
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	645 {
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	646 #define DO_NUMBER(d, v) \
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	647 digits = d; \
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	648 number_value = v; goto do_number
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	649 #define DO_SIGNED_NUMBER(d, negative, v) \
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	650 digits = d; \
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	651 negative_number = negative; \
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	652 u_number_value = v; goto do_signed_number
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	653 #define DO_NUMBER_SPACEPAD(d, v) \
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	654 digits = d; \
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	655 number_value = v; goto do_number_spacepad
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	656
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	657 case L_('%'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	658 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	659 goto bad_format;
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	660 add (1, p = f);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	661 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	662
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	663 case L_('a'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	664 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	665 goto bad_format;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	666 if (change_case)
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	667 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	668 to_uppcase = true;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	669 to_lowcase = false;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	670 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	671 #if defined _NL_CURRENT \|\| !HAVE_STRFTIME
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	672 cpy (aw_len, a_wkday);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	673 break;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	674 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	675 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	676 #endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	677
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	678 case 'A':
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	679 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	680 goto bad_format;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	681 if (change_case)
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	682 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	683 to_uppcase = true;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	684 to_lowcase = false;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	685 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	686 #if defined _NL_CURRENT \|\| !HAVE_STRFTIME
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	687 cpy (STRLEN (f_wkday), f_wkday);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	688 break;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	689 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	690 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	691 #endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	692
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	693 case L_('b'):
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	694 case L_('h'):
2845 d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	695 if (change_case)
d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	696 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	697 to_uppcase = true;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	698 to_lowcase = false;
2845 d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	699 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	700 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	701 goto bad_format;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	702 #if defined _NL_CURRENT \|\| !HAVE_STRFTIME
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	703 cpy (am_len, a_month);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	704 break;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	705 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	706 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	707 #endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	708
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	709 case L_('B'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	710 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	711 goto bad_format;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	712 if (change_case)
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	713 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	714 to_uppcase = true;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	715 to_lowcase = false;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	716 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	717 #if defined _NL_CURRENT \|\| !HAVE_STRFTIME
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	718 cpy (STRLEN (f_month), f_month);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	719 break;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	720 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	721 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	722 #endif
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	723
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	724 case L_('c'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	725 if (modifier == L_('O'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	726 goto bad_format;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	727 #ifdef _NL_CURRENT
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	728 if (! (modifier == 'E'
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	729 && (*(subfmt =
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	730 (const CHAR_T *) _NL_CURRENT (LC_TIME,
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	731 NLW(ERA_D_T_FMT)))
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	732 != '\0')))
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	733 subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	734 #else
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	735 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	736 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	737 # else
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	738 subfmt = L_("%a %b %e %H:%M:%S %Y");
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	739 # endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	740 #endif
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	741
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	742 subformat:
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	743 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	744 CHAR_T *old_start = p;
2923 f7490ca529b7 Update from libc. Jim Meyering <jim@meyering.net> parents: 2845 diff changeset	745 size_t len = my_strftime (NULL, (size_t) -1, subfmt,
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	746 tp extra_args LOCALE_ARG);
2923 f7490ca529b7 Update from libc. Jim Meyering <jim@meyering.net> parents: 2845 diff changeset	747 add (len, my_strftime (p, maxsize - i, subfmt,
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	748 tp extra_args LOCALE_ARG));
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	749
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	750 if (to_uppcase)
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	751 while (old_start < p)
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	752 {
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	753 old_start = TOUPPER ((UCHAR_T) old_start, loc);
816 ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	754 ++old_start;
ef7796f30b31 another new version ... Jim Meyering <jim@meyering.net> parents: 813 diff changeset	755 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	756 }
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	757 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	758
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	759 #if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY)
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	760 underlying_strftime:
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	761 {
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	762 /* The relevant information is available only via the
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	763 underlying strftime implementation, so use that. */
5711 ea764738a776 (my_strftime): Prepend space to format so that we can Paul Eggert <eggert@cs.ucla.edu> parents: 5701 diff changeset	764 char ufmt[5];
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	765 char *u = ufmt;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	766 char ubuf[1024]; /* enough for any single format in practice */
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	767 size_t len;
2378 524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	768 /* Make sure we're calling the actual underlying strftime.
524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	769 In some cases, config.h contains something like
524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	770 "#define strftime rpl_strftime". */
524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	771 # ifdef strftime
524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	772 # undef strftime
2430 1e92ded95c2a (my_strftime) [strftime]: Declare strftime here, since the definition Jim Meyering <jim@meyering.net> parents: 2378 diff changeset	773 size_t strftime ();
2378 524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	774 # endif
524f131fc113 (my_strftime): Make sure we call the system Jim Meyering <jim@meyering.net> parents: 2082 diff changeset	775
5711 ea764738a776 (my_strftime): Prepend space to format so that we can Paul Eggert <eggert@cs.ucla.edu> parents: 5701 diff changeset	776 /* The space helps distinguish strftime failure from empty
ea764738a776 (my_strftime): Prepend space to format so that we can Paul Eggert <eggert@cs.ucla.edu> parents: 5701 diff changeset	777 output. */
ea764738a776 (my_strftime): Prepend space to format so that we can Paul Eggert <eggert@cs.ucla.edu> parents: 5701 diff changeset	778 *u++ = ' ';
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	779 *u++ = '%';
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	780 if (modifier != 0)
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	781 *u++ = modifier;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	782 *u++ = format_char;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	783 *u = '\0';
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	784 len = strftime (ubuf, sizeof ubuf, ufmt, tp);
5714 f6f2b5cd0813 (my_strftime): If the underlying strftime returns 0 Paul Eggert <eggert@cs.ucla.edu> parents: 5711 diff changeset	785 if (len != 0)
f6f2b5cd0813 (my_strftime): If the underlying strftime returns 0 Paul Eggert <eggert@cs.ucla.edu> parents: 5711 diff changeset	786 cpy (len - 1, ubuf + 1);
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	787 }
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	788 break;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	789 #endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	790
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	791 case L_('C'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	792 if (modifier == L_('O'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	793 goto bad_format;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	794 if (modifier == L_('E'))
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	795 {
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	796 #if HAVE_STRUCT_ERA_ENTRY
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	797 struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	798 if (era)
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	799 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	800 # ifdef COMPILE_WIDE
2845 d5bcf4bb7938 Merge in changes from GNU libc. Jim Meyering <jim@meyering.net> parents: 2430 diff changeset	801 size_t len = __wcslen (era->era_wname);
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	802 cpy (len, era->era_wname);
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	803 # else
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	804 size_t len = strlen (era->era_name);
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	805 cpy (len, era->era_name);
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	806 # endif
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	807 break;
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	808 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	809 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	810 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	811 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	812 # endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	813 #endif
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	814 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	815
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	816 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	817 int century = tp->tm_year / 100 + TM_YEAR_BASE / 100;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	818 century -= tp->tm_year % 100 < 0 && 0 < century;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	819 DO_SIGNED_NUMBER (2, tp->tm_year < - TM_YEAR_BASE, century);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	820 }
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	821
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	822 case L_('x'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	823 if (modifier == L_('O'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	824 goto bad_format;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	825 #ifdef _NL_CURRENT
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	826 if (! (modifier == L_('E')
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	827 && (*(subfmt =
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	828 (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	829 != L_('\0'))))
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	830 subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	831 goto subformat;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	832 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	833 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	834 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	835 # else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	836 /* Fall through. */
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	837 # endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	838 #endif
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	839 case L_('D'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	840 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	841 goto bad_format;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	842 subfmt = L_("%m/%d/%y");
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	843 goto subformat;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	844
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	845 case L_('d'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	846 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	847 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	848
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	849 DO_NUMBER (2, tp->tm_mday);
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	850
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	851 case L_('e'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	852 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	853 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	854
657 603fe5f2b1d9 Update from FSF. Jim Meyering <jim@meyering.net> parents: 653 diff changeset	855 DO_NUMBER_SPACEPAD (2, tp->tm_mday);
176 10b9f9091b11 . Jim Meyering <jim@meyering.net> parents: 125 diff changeset	856
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	857 /* All numeric formats set DIGITS and NUMBER_VALUE (or U_NUMBER_VALUE)
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	858 and then jump to one of these three labels. */
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	859
657 603fe5f2b1d9 Update from FSF. Jim Meyering <jim@meyering.net> parents: 653 diff changeset	860 do_number_spacepad:
4318 b6a6c6ee71de (my_strftime): Let the `-' (no-pad) flag affect Jim Meyering <jim@meyering.net> parents: 4300 diff changeset	861 /* Force `_' flag unless overridden by `0' or `-' flag. */
b6a6c6ee71de (my_strftime): Let the `-' (no-pad) flag affect Jim Meyering <jim@meyering.net> parents: 4300 diff changeset	862 if (pad != L_('0') && pad != L_('-'))
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	863 pad = L_('_');
176 10b9f9091b11 . Jim Meyering <jim@meyering.net> parents: 125 diff changeset	864
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	865 do_number:
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	866 /* Format NUMBER_VALUE according to the MODIFIER flag. */
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	867 negative_number = number_value < 0;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	868 u_number_value = number_value;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	869
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	870 do_signed_number:
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	871 /* Format U_NUMBER_VALUE according to the MODIFIER flag.
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	872 NEGATIVE_NUMBER is nonzero if the original number was
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	873 negative; in this case it was converted directly to
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	874 unsigned int (i.e., modulo (UINT_MAX + 1)) without
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	875 negating it. */
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	876 if (modifier == L_('O') && !negative_number)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	877 {
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	878 #ifdef _NL_CURRENT
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	879 /* Get the locale specific alternate representation of
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	880 the number. If none exist NULL is returned. */
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	881 const CHAR_T *cp = nl_get_alt_digit (u_number_value
4297 30aa99ec2725 (widen) [COMPILE_WIDE]: Merge nearly-identical definitions. Jim Meyering <jim@meyering.net> parents: 4296 diff changeset	882 HELPER_LOCALE_ARG);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	883
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	884 if (cp != NULL)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	885 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	886 size_t digitlen = STRLEN (cp);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	887 if (digitlen != 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	888 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	889 cpy (digitlen, cp);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	890 break;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	891 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	892 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	893 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	894 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	895 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	896 # endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	897 #endif
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	898 }
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	899
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	900 bufp = buf + sizeof (buf) / sizeof (buf[0]);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	901
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	902 if (negative_number)
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	903 u_number_value = - u_number_value;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	904
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	905 do
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	906 {
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	907 *--bufp = u_number_value % 10 + L_('0');
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	908 u_number_value /= 10;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	909 }
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	910 while (u_number_value != 0);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	911
6062 af9525e258c2 Make the %s format (seconds since the epoch) work for a negative Jim Meyering <jim@meyering.net> parents: 5960 diff changeset	912 do_number_sign_and_padding:
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	913 if (digits < width)
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	914 digits = width;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	915
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	916 if (negative_number)
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	917 *--bufp = L_('-');
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	918
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	919 if (pad != L_('-'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	920 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	921 int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0]))
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	922 - bufp);
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	923
4298 374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	924 if (padding > 0)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	925 {
4298 374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	926 if (pad == L_('_'))
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	927 {
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	928 if ((size_t) padding >= maxsize - i)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	929 return 0;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	930
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	931 if (p)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	932 memset_space (p, padding);
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	933 i += padding;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	934 width = width > padding ? width - padding : 0;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	935 }
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	936 else
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	937 {
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	938 if ((size_t) digits >= maxsize - i)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	939 return 0;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	940
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	941 if (negative_number)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	942 {
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	943 ++bufp;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	944
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	945 if (p)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	946 *p++ = L_('-');
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	947 ++i;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	948 }
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	949
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	950 if (p)
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	951 memset_zero (p, padding);
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	952 i += padding;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	953 width = 0;
374bfdd48d05 From GNU libc. Jim Meyering <jim@meyering.net> parents: 4297 diff changeset	954 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	955 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	956 }
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	957
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	958 cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	959 break;
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	960
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	961 case L_('F'):
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	962 if (modifier != 0)
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	963 goto bad_format;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	964 subfmt = L_("%Y-%m-%d");
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	965 goto subformat;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	966
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	967 case L_('H'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	968 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	969 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	970
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	971 DO_NUMBER (2, tp->tm_hour);
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	972
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	973 case L_('I'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	974 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	975 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	976
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	977 DO_NUMBER (2, hour12);
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	978
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	979 case L_('k'): /* GNU extension. */
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	980 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	981 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	982
657 603fe5f2b1d9 Update from FSF. Jim Meyering <jim@meyering.net> parents: 653 diff changeset	983 DO_NUMBER_SPACEPAD (2, tp->tm_hour);
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	984
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	985 case L_('l'): /* GNU extension. */
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	986 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	987 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	988
657 603fe5f2b1d9 Update from FSF. Jim Meyering <jim@meyering.net> parents: 653 diff changeset	989 DO_NUMBER_SPACEPAD (2, hour12);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	990
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	991 case L_('j'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	992 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	993 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	994
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	995 DO_SIGNED_NUMBER (3, tp->tm_yday < -1, tp->tm_yday + 1U);
546 baaeb11e50e5 (add_num_tz): New function. Jim Meyering <jim@meyering.net> parents: 307 diff changeset	996
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	997 case L_('M'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	998 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	999 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1000
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1001 DO_NUMBER (2, tp->tm_min);
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1002
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1003 case L_('m'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1004 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1005 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1006
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1007 DO_SIGNED_NUMBER (2, tp->tm_mon < -1, tp->tm_mon + 1U);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1008
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1009 #ifndef _LIBC
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1010 case L_('N'): /* GNU extension. */
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1011 if (modifier == L_('E'))
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1012 goto bad_format;
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1013
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1014 number_value = ns;
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1015 if (width != -1)
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1016 {
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1017 /* Take an explicit width less than 9 as a precision. */
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1018 int j;
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1019 for (j = width; j < 9; j++)
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1020 number_value /= 10;
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1021 }
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1022
de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1023 DO_NUMBER (9, number_value);
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1024 #endif
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1025
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1026 case L_('n'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1027 add (1, *p = L_('\n'));
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1028 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1029
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1030 case L_('P'):
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1031 to_lowcase = true;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1032 #if !defined _NL_CURRENT && HAVE_STRFTIME
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1033 format_char = L_('p');
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1034 #endif
813 7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	1035 /* FALLTHROUGH */
7d01ef99f1b8 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 804 diff changeset	1036
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1037 case L_('p'):
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1038 if (change_case)
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1039 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1040 to_uppcase = false;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1041 to_lowcase = true;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1042 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1043 #if defined _NL_CURRENT \|\| !HAVE_STRFTIME
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1044 cpy (ap_len, ampm);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1045 break;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1046 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1047 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1048 #endif
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	1049
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1050 case L_('R'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1051 subfmt = L_("%H:%M");
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1052 goto subformat;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1053
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1054 case L_('r'):
4558 e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1055 #if !defined _NL_CURRENT && HAVE_STRFTIME
e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1056 goto underlying_strftime;
e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1057 #else
e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1058 # ifdef _NL_CURRENT
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1059 if ((subfmt = (const CHAR_T ) _NL_CURRENT (LC_TIME,
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1060 NLW(T_FMT_AMPM)))
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1061 == L_('\0'))
4558 e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1062 # endif
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1063 subfmt = L_("%I:%M:%S %p");
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1064 goto subformat;
4558 e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1065 #endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1066
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1067 case L_('S'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1068 if (modifier == L_('E'))
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1069 goto bad_format;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1070
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1071 DO_NUMBER (2, tp->tm_sec);
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1072
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1073 case L_('s'): /* GNU extension. */
4558 e7c388835e7c Merge from coreutils. Paul Eggert <eggert@cs.ucla.edu> parents: 4422 diff changeset	1074 {
726 8867c987f8cf (strftime): Accommodate the broken C compiler Jim Meyering <jim@meyering.net> parents: 691 diff changeset	1075 struct tm ltm;
8867c987f8cf (strftime): Accommodate the broken C compiler Jim Meyering <jim@meyering.net> parents: 691 diff changeset	1076 time_t t;
8867c987f8cf (strftime): Accommodate the broken C compiler Jim Meyering <jim@meyering.net> parents: 691 diff changeset	1077
8867c987f8cf (strftime): Accommodate the broken C compiler Jim Meyering <jim@meyering.net> parents: 691 diff changeset	1078 ltm = *tp;
8867c987f8cf (strftime): Accommodate the broken C compiler Jim Meyering <jim@meyering.net> parents: 691 diff changeset	1079 t = mktime (&ltm);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1080
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1081 /* Generate string value for T using time_t arithmetic;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1082 this works even if sizeof (long) < sizeof (time_t). */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1083
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1084 bufp = buf + sizeof (buf) / sizeof (buf[0]);
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1085 negative_number = t < 0;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1086
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1087 do
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1088 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1089 int d = t % 10;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1090 t /= 10;
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1091 *--bufp = (negative_number ? -d : d) + L_('0');
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1092 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1093 while (t != 0);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1094
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1095 digits = 1;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1096 goto do_number_sign_and_padding;
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1097 }
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1098
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1099 case L_('X'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1100 if (modifier == L_('O'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1101 goto bad_format;
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1102 #ifdef _NL_CURRENT
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1103 if (! (modifier == L_('E')
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1104 && (*(subfmt =
4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1105 (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT)))
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1106 != L_('\0'))))
3094 4d9d6b846ce3 Sync with glibc time/strftime.c 1.81. Jim Meyering <jim@meyering.net> parents: 2993 diff changeset	1107 subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1108 goto subformat;
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1109 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1110 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1111 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1112 # else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1113 /* Fall through. */
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1114 # endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1115 #endif
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1116 case L_('T'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1117 subfmt = L_("%H:%M:%S");
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1118 goto subformat;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1119
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1120 case L_('t'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1121 add (1, *p = L_('\t'));
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1122 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1123
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1124 case L_('u'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1125 DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1126
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1127 case L_('U'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1128 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1129 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1130
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1131 DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1132
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1133 case L_('V'):
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1134 case L_('g'):
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1135 case L_('G'):
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1136 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1137 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1138 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1139 /* YEAR is a leap year if and only if (tp->tm_year + TM_YEAR_BASE)
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1140 is a leap year, except that YEAR and YEAR - 1 both work
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1141 correctly even when (tp->tm_year + TM_YEAR_BASE) would
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1142 overflow. */
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1143 int year = (tp->tm_year
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1144 + (tp->tm_year < 0
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1145 ? TM_YEAR_BASE % 400
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1146 : TM_YEAR_BASE % 400 - 400));
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1147 int year_adjust = 0;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1148 int days = iso_week_days (tp->tm_yday, tp->tm_wday);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1149
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1150 if (days < 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1151 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1152 /* This ISO week belongs to the previous year. */
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1153 year_adjust = -1;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1154 days = iso_week_days (tp->tm_yday + (365 + __isleap (year - 1)),
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1155 tp->tm_wday);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1156 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1157 else
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1158 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1159 int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)),
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1160 tp->tm_wday);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1161 if (0 <= d)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1162 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1163 /* This ISO week belongs to the next year. */
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1164 year_adjust = 1;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1165 days = d;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1166 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1167 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1168
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1169 switch (*f)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1170 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1171 case L_('g'):
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1172 {
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1173 int yy = (tp->tm_year % 100 + year_adjust) % 100;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1174 DO_NUMBER (2, (0 <= yy
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1175 ? yy
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1176 : tp->tm_year < -TM_YEAR_BASE - year_adjust
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1177 ? -yy
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1178 : yy + 100));
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1179 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1180
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1181 case L_('G'):
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1182 DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE - year_adjust,
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1183 (tp->tm_year + (unsigned int) TM_YEAR_BASE
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1184 + year_adjust));
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1185
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1186 default:
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1187 DO_NUMBER (2, days / 7 + 1);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1188 }
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1189 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1190
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1191 case L_('W'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1192 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1193 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1194
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1195 DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1196
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1197 case L_('w'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1198 if (modifier == L_('E'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1199 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1200
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1201 DO_NUMBER (1, tp->tm_wday);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1202
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1203 case L_('Y'):
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1204 if (modifier == 'E')
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1205 {
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1206 #if HAVE_STRUCT_ERA_ENTRY
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1207 struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1208 if (era)
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1209 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1210 # ifdef COMPILE_WIDE
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1211 subfmt = era->era_wformat;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1212 # else
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1213 subfmt = era->era_format;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1214 # endif
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1215 goto subformat;
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1216 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1217 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1218 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1219 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1220 # endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1221 #endif
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1222 }
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1223 if (modifier == L_('O'))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1224 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1225 else
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1226 DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE,
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1227 tp->tm_year + (unsigned int) TM_YEAR_BASE);
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1228
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1229 case L_('y'):
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1230 if (modifier == L_('E'))
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1231 {
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1232 #if HAVE_STRUCT_ERA_ENTRY
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1233 struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1234 if (era)
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1235 {
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1236 int delta = tp->tm_year - era->start_date[0];
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1237 DO_NUMBER (1, (era->offset
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1238 + delta * era->absolute_direction));
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1239 }
1109 0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1240 #else
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1241 # if HAVE_STRFTIME
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1242 goto underlying_strftime;
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1243 # endif
0a4438f607ff Update from FSF. Jim Meyering <jim@meyering.net> parents: 1058 diff changeset	1244 #endif
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1245 }
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1246
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1247 {
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1248 int yy = tp->tm_year % 100;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1249 if (yy < 0)
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1250 yy = tp->tm_year < - TM_YEAR_BASE ? -yy : yy + 100;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1251 DO_NUMBER (2, yy);
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1252 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1253
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1254 case L_('Z'):
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1255 if (change_case)
8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1256 {
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1257 to_uppcase = false;
e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1258 to_lowcase = true;
1058 8c9ee29f3de0 update from FSF Jim Meyering <jim@meyering.net> parents: 930 diff changeset	1259 }
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1260
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1261 #if HAVE_TZNAME
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1262 /* The tzset() call might have changed the value. */
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1263 if (!(zone && *zone) && tp->tm_isdst >= 0)
5690 e44b4f85ad9b Include <stdbool.h>. Use bool where appropriate, Paul Eggert <eggert@cs.ucla.edu> parents: 5414 diff changeset	1264 zone = tzname[tp->tm_isdst != 0];
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1265 #endif
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1266 if (! zone)
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1267 zone = "";
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1268
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1269 #ifdef COMPILE_WIDE
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1270 {
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1271 /* The zone string is always given in multibyte form. We have
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1272 to transform it first. */
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1273 wchar_t *wczone;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1274 size_t len;
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1275 widen (zone, wczone, len);
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1276 cpy (len, wczone);
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1277 }
35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1278 #else
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1279 cpy (strlen (zone), zone);
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1280 #endif
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1281 break;
e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1282
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1283 case L_('z'):
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1284 if (tp->tm_isdst < 0)
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1285 break;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1286
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1287 {
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1288 int diff;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1289 #if HAVE_TM_GMTOFF
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1290 diff = tp->tm_gmtoff;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1291 #else
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1292 if (ut)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1293 diff = 0;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1294 else
687 e46401d63db8 revert last change Jim Meyering <jim@meyering.net> parents: 686 diff changeset	1295 {
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1296 struct tm gtm;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1297 struct tm ltm;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1298 time_t lt;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1299
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1300 ltm = *tp;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1301 lt = mktime (&ltm);
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1302
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1303 if (lt == (time_t) -1)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1304 {
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1305 /* mktime returns -1 for errors, but -1 is also a
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1306 valid time_t value. Check whether an error really
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1307 occurred. */
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1308 struct tm tm;
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1309
4621 3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	1310 if (! __localtime_r (&lt, &tm)
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1311 \|\| ((ltm.tm_sec ^ tm.tm_sec)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1312 \| (ltm.tm_min ^ tm.tm_min)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1313 \| (ltm.tm_hour ^ tm.tm_hour)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1314 \| (ltm.tm_mday ^ tm.tm_mday)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1315 \| (ltm.tm_mon ^ tm.tm_mon)
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1316 \| (ltm.tm_year ^ tm.tm_year)))
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1317 break;
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1318 }
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1319
4621 3d28ad4e18e2 Add time_r module. Change timegm, mktime, and strftime to use localtime_r Paul Eggert <eggert@cs.ucla.edu> parents: 4558 diff changeset	1320 if (! __gmtime_r (&lt, &gtm))
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1321 break;
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1322
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1323 diff = tm_diff (&ltm, &gtm);
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1324 }
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1325 #endif
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1326
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1327 if (diff < 0)
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1328 {
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1329 add (1, *p = L_('-'));
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1330 diff = -diff;
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1331 }
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1332 else
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1333 add (1, *p = L_('+'));
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1334
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1335 diff /= 60;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1336 DO_NUMBER (4, (diff / 60) * 100 + diff % 60);
672 d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1337 }
d4a380613840 Update from GNU libc -- this adds back %z and %s Jim Meyering <jim@meyering.net> parents: 668 diff changeset	1338
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1339 case L_('\0'): /* GNU extension: % at end of format. */
794 8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1340 --f;
8d2567244c18 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 782 diff changeset	1341 /* Fall through. */
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1342 default:
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1343 /* Unknown format; output the format, including the '%',
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1344 since this is most likely the right thing to do if a
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1345 multibyte string has been misparsed. */
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1346 bad_format:
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1347 {
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1348 int flen;
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1349 for (flen = 1; f[1 - flen] != L_('%'); flen++)
691 6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1350 continue;
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1351 cpy (flen, &f[1 - flen]);
6813ffe12e6a (strftime): New version, from GNU libc. Jim Meyering <jim@meyering.net> parents: 687 diff changeset	1352 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1353 break;
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	1354 }
f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	1355 }
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1356
1775 96099c7ba283 Update from master source in libc, removing %f. Jim Meyering <jim@meyering.net> parents: 1557 diff changeset	1357 if (p && maxsize != 0)
2082 35c2c4e86de2 Sync with the GNU C Library. Jim Meyering <jim@meyering.net> parents: 2060 diff changeset	1358 *p = L_('\0');
604 e54f6bf3d960 Update from GNU libc. Jim Meyering <jim@meyering.net> parents: 582 diff changeset	1359 return i;
9 f8dce34b5ab0 Initial revision Jim Meyering <jim@meyering.net> parents: diff changeset	1360 }
4296 2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1361 #ifdef _LIBC
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1362 libc_hidden_def (my_strftime)
2da9db9c7ef8 (my_strftime): Merge in locale-related changes from libc. Jim Meyering <jim@meyering.net> parents: 3670 diff changeset	1363 #endif
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1364
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1365
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1366 #ifdef emacs
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1367 /* For Emacs we have a separate interface which corresponds to the normal
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1368 strftime function plus the ut argument, but without the ns argument. */
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1369 size_t
4693 490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	1370 emacs_strftimeu (char s, size_t maxsize, const char format,
490ea9ec1ffb Remove K&R cruft. Paul Eggert <eggert@cs.ucla.edu> parents: 4621 diff changeset	1371 const struct tm *tp, int ut)
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1372 {
3261 de5ef6b00dd9 (my_strftime): Jim Meyering <jim@meyering.net> parents: 3181 diff changeset	1373 return my_strftime (s, maxsize, format, tp, ut, 0);
1535 72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1374 }
72809df6189a Don't invoke localtime_r or gmtime_r unless it's the GNU C Jim Meyering <jim@meyering.net> parents: 1532 diff changeset	1375 #endif

Mercurial > hg > octave-shane > gnulib-hg

annotate lib/strftime.c @ 6062:af9525e258c2