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