Mercurial > hg > octave-kai > gnulib-hg
annotate lib/strftime.c @ 1334:2139187e171f
tweak from FSF
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Tue, 28 Apr 1998 12:19:53 +0000 |
| parents | 7cc87904bdba |
| children | f6780e49c13d |
| rev | line source |
|---|---|
| 1334 | 1 /* Copyright (C) 1991,92,93,94,95,96,97,98 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 | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU 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 | |
|
1126
7cc87904bdba
(_REENTRANT): #define, as some hosts need this to declare localtime_r properly.
Jim Meyering <jim@meyering.net>
parents:
1109
diff
changeset
|
25 /* Some systems need this in order to declare localtime_r properly. */ |
|
7cc87904bdba
(_REENTRANT): #define, as some hosts need this to declare localtime_r properly.
Jim Meyering <jim@meyering.net>
parents:
1109
diff
changeset
|
26 #ifndef _REENTRANT |
|
7cc87904bdba
(_REENTRANT): #define, as some hosts need this to declare localtime_r properly.
Jim Meyering <jim@meyering.net>
parents:
1109
diff
changeset
|
27 # define _REENTRANT 1 |
|
7cc87904bdba
(_REENTRANT): #define, as some hosts need this to declare localtime_r properly.
Jim Meyering <jim@meyering.net>
parents:
1109
diff
changeset
|
28 #endif |
|
7cc87904bdba
(_REENTRANT): #define, as some hosts need this to declare localtime_r properly.
Jim Meyering <jim@meyering.net>
parents:
1109
diff
changeset
|
29 |
| 604 | 30 #ifdef _LIBC |
| 31 # define HAVE_LIMITS_H 1 | |
| 32 # define HAVE_MBLEN 1 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
33 # define HAVE_MBRLEN 1 |
| 794 | 34 # define HAVE_STRUCT_ERA_ENTRY 1 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
35 # define HAVE_TM_GMTOFF 1 |
| 604 | 36 # define HAVE_TM_ZONE 1 |
| 813 | 37 # define HAVE_TZNAME 1 |
| 38 # define HAVE_TZSET 1 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
39 # define MULTIBYTE_IS_FORMAT_SAFE 1 |
| 604 | 40 # define STDC_HEADERS 1 |
| 41 # include "../locale/localeinfo.h" | |
| 125 | 42 #endif |
| 43 | |
| 1058 | 44 #if defined emacs && !defined HAVE_BCOPY |
| 45 # define HAVE_MEMCPY 1 | |
| 46 #endif | |
| 47 | |
| 813 | 48 #include <ctype.h> |
| 604 | 49 #include <sys/types.h> /* Some systems define `time_t' here. */ |
| 50 | |
| 51 #ifdef TIME_WITH_SYS_TIME | |
| 52 # include <sys/time.h> | |
| 53 # include <time.h> | |
| 9 | 54 #else |
| 604 | 55 # ifdef HAVE_SYS_TIME_H |
| 56 # include <sys/time.h> | |
| 57 # else | |
| 58 # include <time.h> | |
| 59 # endif | |
| 60 #endif | |
| 803 | 61 #if HAVE_TZNAME |
|
801
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
62 extern char *tzname[]; |
|
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
63 #endif |
|
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
64 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
65 /* Do multibyte processing if multibytes are supported, unless |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
66 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
|
67 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
|
68 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
|
69 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
|
70 with other C libraries that use unsafe encodings. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
71 #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
|
72 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
73 #if DO_MULTIBYTE |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
74 # if HAVE_MBRLEN |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
75 # include <wchar.h> |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
76 # else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
77 /* Simulate mbrlen with mblen as best we can. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
78 # define mbstate_t int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
79 # define mbrlen(s, n, ps) mblen (s, n) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
80 # define mbsinit(ps) (*(ps) == 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
81 # endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
82 static const mbstate_t mbstate_zero; |
| 604 | 83 #endif |
| 84 | |
| 85 #if HAVE_LIMITS_H | |
| 86 # include <limits.h> | |
| 9 | 87 #endif |
| 88 | |
| 604 | 89 #if STDC_HEADERS |
| 90 # include <stddef.h> | |
| 91 # include <stdlib.h> | |
| 92 # include <string.h> | |
| 93 #else | |
| 1058 | 94 # ifndef HAVE_MEMCPY |
| 95 # define memcpy(d, s, n) bcopy ((s), (d), (n)) | |
| 96 # endif | |
| 176 | 97 #endif |
| 98 | |
| 1109 | 99 #ifdef _LIBC |
| 100 # define MEMPCPY(d, s, n) __mempcpy (d, s, n) | |
| 101 #else | |
| 102 # ifndef HAVE_MEMPCPY | |
| 103 # define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n))) | |
| 104 # endif | |
| 105 #endif | |
| 106 | |
| 604 | 107 #ifndef __P |
| 817 | 108 # if defined (__GNUC__) || (defined (__STDC__) && __STDC__) |
| 109 # define __P(args) args | |
| 110 # else | |
| 111 # define __P(args) () | |
| 112 # endif /* GCC. */ | |
| 604 | 113 #endif /* Not __P. */ |
| 114 | |
| 115 #ifndef PTR | |
| 817 | 116 # ifdef __STDC__ |
| 117 # define PTR void * | |
| 118 # else | |
| 119 # define PTR char * | |
| 120 # endif | |
| 9 | 121 #endif |
| 122 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
123 #ifndef CHAR_BIT |
| 817 | 124 # define CHAR_BIT 8 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
125 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
126 |
| 816 | 127 #ifndef NULL |
| 817 | 128 # define NULL 0 |
| 816 | 129 #endif |
| 130 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
131 #define TYPE_SIGNED(t) ((t) -1 < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
132 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
133 /* 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
|
134 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
|
135 302 / 1000 is log10 (2) rounded up; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
136 add one for integer division truncation; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
137 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
|
138 #define INT_STRLEN_BOUND(t) \ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
139 ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 100 + 1 + TYPE_SIGNED (t)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
140 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
141 #define TM_YEAR_BASE 1900 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
142 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
143 #ifndef __isleap |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
144 /* 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
|
145 except every 100th isn't, and every 400th is). */ |
| 817 | 146 # define __isleap(year) \ |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
147 ((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
|
148 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
149 |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
150 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
151 #ifdef _LIBC |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
152 # define gmtime_r __gmtime_r |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
153 # define localtime_r __localtime_r |
| 816 | 154 # define tzname __tzname |
| 155 # define tzset __tzset | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
156 #else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
157 # if ! HAVE_LOCALTIME_R |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
158 # if ! HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
159 /* Approximate gmtime_r as best we can in its absence. */ |
| 1058 | 160 # undef gmtime_r |
|
930
589c196817a6
correct/normalize indentation in cpp directives
Jim Meyering <jim@meyering.net>
parents:
929
diff
changeset
|
161 # define gmtime_r my_gmtime_r |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
162 static struct tm *gmtime_r __P ((const time_t *, struct tm *)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
163 static struct tm * |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
164 gmtime_r (t, tp) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
165 const time_t *t; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
166 struct tm *tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
167 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
168 struct tm *l = gmtime (t); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
169 if (! l) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
170 return 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
171 *tp = *l; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
172 return tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
173 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
174 # endif /* ! HAVE_TM_GMTOFF */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
175 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
176 /* Approximate localtime_r as best we can in its absence. */ |
| 1058 | 177 # undef localtime_r |
| 178 # define localtime_r my_ftime_localtime_r | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
179 static struct tm *localtime_r __P ((const time_t *, struct tm *)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
180 static struct tm * |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
181 localtime_r (t, tp) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
182 const time_t *t; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
183 struct tm *tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
184 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
185 struct tm *l = localtime (t); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
186 if (! l) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
187 return 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
188 *tp = *l; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
189 return tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
190 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
191 # endif /* ! HAVE_LOCALTIME_R */ |
| 1109 | 192 #endif /* ! defined _LIBC */ |
| 9 | 193 |
| 194 | |
| 1058 | 195 #if !defined memset && !defined HAVE_MEMSET && !defined _LIBC |
| 813 | 196 /* Some systems lack the `memset' function and we don't want to |
| 197 introduce additional dependencies. */ | |
| 1058 | 198 /* The SGI compiler reportedly barfs on the trailing null |
| 199 if we use a string constant as the initializer. 28 June 1997, rms. */ | |
| 200 static const char spaces[16] = /* " " */ | |
| 201 { ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ' }; | |
| 202 static const char zeroes[16] = /* "0000000000000000" */ | |
| 203 { '0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0' }; | |
| 813 | 204 |
| 205 # define memset_space(P, Len) \ | |
| 206 do { \ | |
| 207 int _len = (Len); \ | |
| 929 | 208 \ |
| 813 | 209 do \ |
| 210 { \ | |
| 211 int _this = _len > 16 ? 16 : _len; \ | |
| 1109 | 212 (P) = MEMPCPY ((P), spaces, _this); \ |
| 813 | 213 _len -= _this; \ |
| 214 } \ | |
| 215 while (_len > 0); \ | |
| 216 } while (0) | |
| 929 | 217 |
| 218 # define memset_zero(P, Len) \ | |
| 219 do { \ | |
| 220 int _len = (Len); \ | |
| 221 \ | |
| 222 do \ | |
| 223 { \ | |
| 224 int _this = _len > 16 ? 16 : _len; \ | |
| 1109 | 225 (P) = MEMPCPY ((P), zeroes, _this); \ |
| 929 | 226 _len -= _this; \ |
| 227 } \ | |
| 228 while (_len > 0); \ | |
| 229 } while (0) | |
| 813 | 230 #else |
| 929 | 231 # define memset_space(P, Len) (memset ((P), ' ', (Len)), (P) += (Len)) |
| 232 # define memset_zero(P, Len) (memset ((P), '0', (Len)), (P) += (Len)) | |
| 813 | 233 #endif |
| 234 | |
|
930
589c196817a6
correct/normalize indentation in cpp directives
Jim Meyering <jim@meyering.net>
parents:
929
diff
changeset
|
235 #define add(n, f) \ |
| 604 | 236 do \ |
| 237 { \ | |
| 813 | 238 int _n = (n); \ |
| 239 int _delta = width - _n; \ | |
| 816 | 240 int _incr = _n + (_delta > 0 ? _delta : 0); \ |
| 241 if (i + _incr >= maxsize) \ | |
| 604 | 242 return 0; \ |
| 816 | 243 if (p) \ |
| 244 { \ | |
| 245 if (_delta > 0) \ | |
| 929 | 246 { \ |
| 247 if (pad == '0') \ | |
| 248 memset_zero (p, _delta); \ | |
| 249 else \ | |
| 250 memset_space (p, _delta); \ | |
| 251 } \ | |
| 816 | 252 f; \ |
| 253 p += _n; \ | |
| 254 } \ | |
| 255 i += _incr; \ | |
| 604 | 256 } while (0) |
| 813 | 257 |
|
930
589c196817a6
correct/normalize indentation in cpp directives
Jim Meyering <jim@meyering.net>
parents:
929
diff
changeset
|
258 #define cpy(n, s) \ |
| 813 | 259 add ((n), \ |
| 260 if (to_lowcase) \ | |
| 261 memcpy_lowcase (p, (s), _n); \ | |
| 816 | 262 else if (to_uppcase) \ |
| 263 memcpy_uppcase (p, (s), _n); \ | |
| 813 | 264 else \ |
| 265 memcpy ((PTR) p, (PTR) (s), _n)) | |
| 266 | |
| 267 | |
| 268 | |
| 269 #ifdef _LIBC | |
| 270 # define TOUPPER(Ch) toupper (Ch) | |
| 271 # define TOLOWER(Ch) tolower (Ch) | |
| 272 #else | |
| 273 # define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch)) | |
| 274 # define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) | |
| 275 #endif | |
| 819 | 276 /* We don't use `isdigit' here since the locale dependent |
| 277 interpretation is not what we want here. We only need to accept | |
| 278 the arabic digits in the ASCII range. One day there is perhaps a | |
| 279 more reliable way to accept other sets of digits. */ | |
| 280 #define ISDIGIT(Ch) ((unsigned int) (Ch) - '0' <= 9) | |
| 813 | 281 |
| 282 static char *memcpy_lowcase __P ((char *dest, const char *src, size_t len)); | |
| 283 | |
| 284 static char * | |
| 285 memcpy_lowcase (dest, src, len) | |
| 286 char *dest; | |
| 287 const char *src; | |
| 288 size_t len; | |
| 289 { | |
| 290 while (len-- > 0) | |
| 1109 | 291 dest[len] = TOLOWER ((unsigned char) src[len]); |
| 813 | 292 return dest; |
| 293 } | |
| 9 | 294 |
| 816 | 295 static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len)); |
| 296 | |
| 297 static char * | |
| 298 memcpy_uppcase (dest, src, len) | |
| 299 char *dest; | |
| 300 const char *src; | |
| 301 size_t len; | |
| 302 { | |
| 303 while (len-- > 0) | |
| 1109 | 304 dest[len] = TOUPPER ((unsigned char) src[len]); |
| 816 | 305 return dest; |
| 306 } | |
| 307 | |
| 1058 | 308 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
309 #if ! HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
310 /* Yield the difference between *A and *B, |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
311 measured in seconds, ignoring leap seconds. */ |
| 1058 | 312 # define tm_diff ftime_tm_diff |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
313 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
|
314 static int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
315 tm_diff (a, b) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
316 const struct tm *a; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
317 const struct tm *b; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
318 { |
| 794 | 319 /* Compute intervening leap days correctly even if year is negative. |
| 320 Take care to avoid int overflow in leap day calculations, | |
| 321 but it's OK to assume that A and B are close to each other. */ | |
| 322 int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3); | |
| 323 int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3); | |
| 324 int a100 = a4 / 25 - (a4 % 25 < 0); | |
| 325 int b100 = b4 / 25 - (b4 % 25 < 0); | |
| 326 int a400 = a100 >> 2; | |
| 327 int b400 = b100 >> 2; | |
| 328 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); | |
| 329 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
|
330 int days = (365 * years + intervening_leap_days |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
331 + (a->tm_yday - b->tm_yday)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
332 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
|
333 + (a->tm_min - b->tm_min)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
334 + (a->tm_sec - b->tm_sec)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
335 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
336 #endif /* ! HAVE_TM_GMTOFF */ |
| 9 | 337 |
| 604 | 338 |
| 9 | 339 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
340 /* 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
|
341 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
|
342 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
|
343 be as small as YDAY_MINIMUM. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
344 #define ISO_WEEK_START_WDAY 1 /* Monday */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
345 #define ISO_WEEK1_WDAY 4 /* Thursday */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
346 #define YDAY_MINIMUM (-366) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
347 static int iso_week_days __P ((int, int)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
348 #ifdef __GNUC__ |
| 1058 | 349 __inline__ |
| 604 | 350 #endif |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
351 static int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
352 iso_week_days (yday, wday) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
353 int yday; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
354 int wday; |
| 604 | 355 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
356 /* 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
|
357 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
|
358 return (yday |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
359 - (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
|
360 + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
361 } |
| 9 | 362 |
| 363 | |
| 1109 | 364 #if !(defined _NL_CURRENT || HAVE_STRFTIME) |
| 604 | 365 static char const weekday_name[][10] = |
| 366 { | |
| 367 "Sunday", "Monday", "Tuesday", "Wednesday", | |
| 368 "Thursday", "Friday", "Saturday" | |
| 369 }; | |
| 370 static char const month_name[][10] = | |
| 371 { | |
| 372 "January", "February", "March", "April", "May", "June", | |
| 373 "July", "August", "September", "October", "November", "December" | |
| 374 }; | |
| 375 #endif | |
| 9 | 376 |
|
860
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
377 |
| 1109 | 378 #ifdef emacs |
| 379 # define my_strftime emacs_strftime | |
| 380 /* Emacs 20.2 uses `-Dstrftime=emacs_strftime' when compiling, | |
| 381 because that's how strftime used to be configured. | |
| 382 Undo this, since it gets in the way of accessing the underlying strftime, | |
| 383 which is needed for things like %Ec in Solaris. | |
| 384 The following two lines can be removed once Emacs stops compiling with | |
| 385 `-Dstrftime=emacs_strftime'. */ | |
| 386 # undef strftime | |
| 387 size_t strftime __P ((char *, size_t, const char *, const struct tm *)); | |
| 388 #else | |
| 389 # define my_strftime strftime | |
| 390 #endif | |
| 391 | |
|
860
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
392 #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
|
393 /* 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
|
394 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
|
395 size_t _strftime_copytm __P ((char *, size_t, const char *, |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
396 const struct tm *)); |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
397 size_t |
| 1109 | 398 my_strftime (s, maxsize, format, tp) |
|
860
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
399 char *s; |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
400 size_t maxsize; |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
401 const char *format; |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
402 const struct tm *tp; |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
403 { |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
404 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
|
405 tmcopy = *tp; |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
406 return _strftime_copytm (s, maxsize, format, &tmcopy); |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
407 } |
| 1109 | 408 # undef my_strftime |
| 409 # define my_strftime(S, Maxsize, Format, Tp) \ | |
| 929 | 410 _strftime_copytm (S, Maxsize, Format, Tp) |
|
860
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
411 #endif |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
412 |
|
68da68da125e
(_strftime_copytm): New function, to work around Solaris 2.5 tzset bug.
Jim Meyering <jim@meyering.net>
parents:
829
diff
changeset
|
413 |
| 604 | 414 /* Write information from TP into S according to the format |
| 415 string FORMAT, writing no more that MAXSIZE characters | |
| 416 (including the terminating '\0') and returning number of | |
| 417 characters written. If S is NULL, nothing will be written | |
| 418 anywhere, so to determine how many characters would be | |
| 419 written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */ | |
| 420 size_t | |
| 1109 | 421 my_strftime (s, maxsize, format, tp) |
| 604 | 422 char *s; |
| 423 size_t maxsize; | |
| 424 const char *format; | |
| 813 | 425 const struct tm *tp; |
| 604 | 426 { |
| 427 int hour12 = tp->tm_hour; | |
| 428 #ifdef _NL_CURRENT | |
| 429 const char *const a_wkday = _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday); | |
| 430 const char *const f_wkday = _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday); | |
| 431 const char *const a_month = _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon); | |
| 432 const char *const f_month = _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon); | |
| 433 const char *const ampm = _NL_CURRENT (LC_TIME, | |
| 434 hour12 > 11 ? PM_STR : AM_STR); | |
| 794 | 435 size_t aw_len = strlen (a_wkday); |
| 436 size_t am_len = strlen (a_month); | |
| 604 | 437 size_t ap_len = strlen (ampm); |
| 438 #else | |
| 1109 | 439 # if !HAVE_STRFTIME |
| 604 | 440 const char *const f_wkday = weekday_name[tp->tm_wday]; |
| 441 const char *const f_month = month_name[tp->tm_mon]; | |
| 442 const char *const a_wkday = f_wkday; | |
| 443 const char *const a_month = f_month; | |
| 444 const char *const ampm = "AMPM" + 2 * (hour12 > 11); | |
| 445 size_t aw_len = 3; | |
| 446 size_t am_len = 3; | |
| 447 size_t ap_len = 2; | |
| 1109 | 448 # endif |
| 604 | 449 #endif |
| 1109 | 450 #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
|
451 size_t wkday_len = strlen (f_wkday); |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
452 size_t month_len = strlen (f_month); |
| 1109 | 453 #endif |
| 604 | 454 const char *zone; |
| 455 size_t zonelen; | |
| 813 | 456 size_t i = 0; |
| 457 char *p = s; | |
| 458 const char *f; | |
|
582
3ec26150a8d6
(mon_week_ISO): New function to implement new %V format.
Jim Meyering <jim@meyering.net>
parents:
581
diff
changeset
|
459 |
| 813 | 460 zone = NULL; |
| 1058 | 461 #if HAVE_TM_ZONE |
| 462 /* The POSIX test suite assumes that setting | |
| 813 | 463 the environment variable TZ to a new value before calling strftime() |
| 464 will influence the result (the %Z format) even if the information in | |
| 1058 | 465 TP is computed with a totally different time zone. |
| 466 This is bogus: though POSIX allows bad behavior like this, | |
| 467 POSIX does not require it. Do the right thing instead. */ | |
| 604 | 468 zone = (const char *) tp->tm_zone; |
| 469 #endif | |
| 470 #if HAVE_TZNAME | |
| 813 | 471 /* POSIX.1 8.1.1 requires that whenever strftime() is called, the |
| 472 time zone names contained in the external variable `tzname' shall | |
| 473 be set as if the tzset() function had been called. */ | |
| 474 # if HAVE_TZSET | |
| 475 tzset (); | |
| 476 # endif | |
| 477 | |
| 604 | 478 if (!(zone && *zone) && tp->tm_isdst >= 0) |
| 479 zone = tzname[tp->tm_isdst]; | |
| 480 #endif | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
481 if (! zone) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
482 zone = ""; /* POSIX.2 requires the empty string here. */ |
|
582
3ec26150a8d6
(mon_week_ISO): New function to implement new %V format.
Jim Meyering <jim@meyering.net>
parents:
581
diff
changeset
|
483 |
| 604 | 484 zonelen = strlen (zone); |
| 485 | |
| 486 if (hour12 > 12) | |
| 487 hour12 -= 12; | |
| 488 else | |
| 489 if (hour12 == 0) hour12 = 12; | |
| 490 | |
| 491 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
|
492 { |
| 1334 | 493 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
|
494 int modifier; /* Field modifier ('E', 'O', or 0). */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
495 int digits; /* Max digits for numeric format. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
496 int number_value; /* Numeric value to be printed. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
497 int negative_number; /* 1 if the number is negative. */ |
| 604 | 498 const char *subfmt; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
499 char *bufp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
500 char buf[1 + (sizeof (int) < sizeof (time_t) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
501 ? INT_STRLEN_BOUND (time_t) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
502 : INT_STRLEN_BOUND (int))]; |
| 813 | 503 int width = -1; |
| 504 int to_lowcase = 0; | |
| 816 | 505 int to_uppcase = 0; |
| 1058 | 506 int change_case = 0; |
| 1109 | 507 int format_char; |
| 9 | 508 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
509 #if DO_MULTIBYTE |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
510 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
511 switch (*f) |
| 604 | 512 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
513 case '%': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
514 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
515 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
516 case '\a': case '\b': case '\t': case '\n': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
517 case '\v': case '\f': case '\r': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
518 case ' ': case '!': case '"': case '#': case '&': case'\'': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
519 case '(': case ')': case '*': case '+': case ',': case '-': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
520 case '.': case '/': case '0': case '1': case '2': case '3': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
521 case '4': case '5': case '6': case '7': case '8': case '9': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
522 case ':': case ';': case '<': case '=': case '>': case '?': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
523 case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
524 case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
525 case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
526 case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
527 case 'Y': case 'Z': case '[': case'\\': case ']': case '^': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
528 case '_': case 'a': case 'b': case 'c': case 'd': case 'e': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
529 case 'f': case 'g': case 'h': case 'i': case 'j': case 'k': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
530 case 'l': case 'm': case 'n': case 'o': case 'p': case 'q': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
531 case 'r': case 's': case 't': case 'u': case 'v': case 'w': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
532 case 'x': case 'y': case 'z': case '{': case '|': case '}': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
533 case '~': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
534 /* The C Standard requires these 98 characters (plus '%') to |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
535 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
|
536 characters can start a multibyte sequence, so they need |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
537 not be analyzed further. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
538 add (1, *p = *f); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
539 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
540 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
541 default: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
542 /* 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
|
543 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
|
544 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
545 mbstate_t mbstate = mbstate_zero; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
546 size_t len = 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
547 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
548 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
549 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
550 size_t bytes = mbrlen (f + len, (size_t) -1, &mbstate); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
551 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
552 if (bytes == 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
553 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
554 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
555 if (bytes == (size_t) -2 || bytes == (size_t) -1) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
556 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
557 len++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
558 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
559 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
560 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
561 len += bytes; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
562 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
563 while (! mbsinit (&mbstate)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
564 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
565 cpy (len, f); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
566 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
567 } |
| 604 | 568 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
569 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
570 #else /* ! DO_MULTIBYTE */ |
| 9 | 571 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
572 /* Either multibyte encodings are not supported, or they are |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
573 safe for formats, so any non-'%' byte can be copied through. */ |
| 604 | 574 if (*f != '%') |
| 575 { | |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
576 add (1, *p = *f); |
| 604 | 577 continue; |
| 578 } | |
| 9 | 579 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
580 #endif /* ! DO_MULTIBYTE */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
581 |
| 829 | 582 /* Check for flags that can modify a format. */ |
| 813 | 583 while (1) |
| 9 | 584 { |
| 816 | 585 switch (*++f) |
| 813 | 586 { |
| 829 | 587 /* This influences the number formats. */ |
| 813 | 588 case '_': |
| 589 case '-': | |
| 590 case '0': | |
| 816 | 591 pad = *f; |
| 592 continue; | |
| 593 | |
| 829 | 594 /* This changes textual output. */ |
| 816 | 595 case '^': |
| 596 to_uppcase = 1; | |
| 597 continue; | |
| 1058 | 598 case '#': |
| 599 change_case = 1; | |
| 600 continue; | |
| 813 | 601 |
| 602 default: | |
| 603 break; | |
| 604 } | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
605 break; |
| 813 | 606 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
607 |
| 813 | 608 /* As a GNU extension we allow to specify the field width. */ |
| 819 | 609 if (ISDIGIT (*f)) |
| 813 | 610 { |
| 611 width = 0; | |
| 612 do | |
| 613 { | |
| 614 width *= 10; | |
| 615 width += *f - '0'; | |
| 819 | 616 ++f; |
| 813 | 617 } |
| 819 | 618 while (ISDIGIT (*f)); |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
619 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
620 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
621 /* Check for modifiers. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
622 switch (*f) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
623 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
624 case 'E': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
625 case 'O': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
626 modifier = *f++; |
| 604 | 627 break; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
628 |
| 604 | 629 default: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
630 modifier = 0; |
| 604 | 631 break; |
| 632 } | |
| 9 | 633 |
| 604 | 634 /* Now do the specified format. */ |
| 1109 | 635 format_char = *f; |
| 636 switch (format_char) | |
| 604 | 637 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
638 #define DO_NUMBER(d, v) \ |
| 1058 | 639 digits = width == -1 ? d : width; \ |
| 640 number_value = v; goto do_number | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
641 #define DO_NUMBER_SPACEPAD(d, v) \ |
| 1058 | 642 digits = width == -1 ? d : width; \ |
| 643 number_value = v; goto do_number_spacepad | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
644 |
| 604 | 645 case '%': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
646 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
647 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
648 add (1, *p = *f); |
| 604 | 649 break; |
| 650 | |
| 651 case 'a': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
652 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
653 goto bad_format; |
| 1058 | 654 if (change_case) |
| 655 { | |
| 656 to_uppcase = 1; | |
| 657 to_lowcase = 0; | |
| 658 } | |
| 1109 | 659 #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
|
660 cpy (aw_len, a_wkday); |
| 604 | 661 break; |
| 1109 | 662 #else |
| 663 goto underlying_strftime; | |
| 664 #endif | |
| 604 | 665 |
| 666 case 'A': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
667 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
668 goto bad_format; |
| 1058 | 669 if (change_case) |
| 670 { | |
| 671 to_uppcase = 1; | |
| 672 to_lowcase = 0; | |
| 673 } | |
| 1109 | 674 #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
|
675 cpy (wkday_len, f_wkday); |
| 604 | 676 break; |
| 1109 | 677 #else |
| 678 goto underlying_strftime; | |
| 679 #endif | |
| 604 | 680 |
| 681 case 'b': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
682 case 'h': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
683 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
684 goto bad_format; |
| 1109 | 685 #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
|
686 cpy (am_len, a_month); |
| 604 | 687 break; |
| 1109 | 688 #else |
| 689 goto underlying_strftime; | |
| 690 #endif | |
| 604 | 691 |
| 692 case 'B': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
693 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
694 goto bad_format; |
| 1058 | 695 if (change_case) |
| 696 { | |
| 697 to_uppcase = 1; | |
| 698 to_lowcase = 0; | |
| 699 } | |
| 1109 | 700 #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
|
701 cpy (month_len, f_month); |
| 604 | 702 break; |
| 1109 | 703 #else |
| 704 goto underlying_strftime; | |
| 705 #endif | |
| 9 | 706 |
| 604 | 707 case 'c': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
708 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
709 goto bad_format; |
| 604 | 710 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
711 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
712 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0')) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
713 subfmt = _NL_CURRENT (LC_TIME, D_T_FMT); |
| 604 | 714 #else |
| 1109 | 715 # if HAVE_STRFTIME |
| 716 goto underlying_strftime; | |
| 717 # else | |
|
797
a82f1b225592
(strftime): Remove " %Z" part of format for %c. Suggestion from Paul Eggert.
Jim Meyering <jim@meyering.net>
parents:
794
diff
changeset
|
718 subfmt = "%a %b %e %H:%M:%S %Y"; |
| 1109 | 719 # endif |
| 604 | 720 #endif |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
721 |
| 604 | 722 subformat: |
| 723 { | |
| 816 | 724 char *old_start = p; |
| 1109 | 725 size_t len = my_strftime (NULL, maxsize - i, subfmt, tp); |
| 604 | 726 if (len == 0 && *subfmt) |
| 727 return 0; | |
| 1109 | 728 add (len, my_strftime (p, maxsize - i, subfmt, tp)); |
| 816 | 729 |
| 730 if (to_uppcase) | |
| 731 while (old_start < p) | |
| 732 { | |
| 1109 | 733 *old_start = TOUPPER ((unsigned char) *old_start); |
| 816 | 734 ++old_start; |
| 735 } | |
| 604 | 736 } |
| 737 break; | |
| 738 | |
| 1109 | 739 #if HAVE_STRFTIME && ! (defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY) |
| 740 underlying_strftime: | |
| 741 { | |
| 742 /* The relevant information is available only via the | |
| 743 underlying strftime implementation, so use that. */ | |
| 744 char ufmt[4]; | |
| 745 char *u = ufmt; | |
| 746 char ubuf[1024]; /* enough for any single format in practice */ | |
| 747 size_t len; | |
| 748 *u++ = '%'; | |
| 749 if (modifier != 0) | |
| 750 *u++ = modifier; | |
| 751 *u++ = format_char; | |
| 752 *u = '\0'; | |
| 753 len = strftime (ubuf, sizeof ubuf, ufmt, tp); | |
| 754 if (len == 0) | |
| 755 return 0; | |
| 756 cpy (len, ubuf); | |
| 757 } | |
| 758 break; | |
| 759 #endif | |
| 760 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
761 case 'C': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
762 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
763 goto bad_format; |
| 794 | 764 if (modifier == 'E') |
| 765 { | |
| 1109 | 766 #if HAVE_STRUCT_ERA_ENTRY |
| 794 | 767 struct era_entry *era = _nl_get_era_entry (tp); |
| 768 if (era) | |
| 769 { | |
| 770 size_t len = strlen (era->name_fmt); | |
| 771 cpy (len, era->name_fmt); | |
| 772 break; | |
| 773 } | |
| 1109 | 774 #else |
| 775 # if HAVE_STRFTIME | |
| 776 goto underlying_strftime; | |
| 777 # endif | |
| 778 #endif | |
| 794 | 779 } |
| 1109 | 780 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
781 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
782 int year = tp->tm_year + TM_YEAR_BASE; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
783 DO_NUMBER (1, year / 100 - (year % 100 < 0)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
784 } |
| 9 | 785 |
| 604 | 786 case 'x': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
787 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
788 goto bad_format; |
| 604 | 789 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
790 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
791 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_FMT)) != '\0')) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
792 subfmt = _NL_CURRENT (LC_TIME, D_FMT); |
| 604 | 793 goto subformat; |
| 1109 | 794 #else |
| 795 # if HAVE_STRFTIME | |
| 796 goto underlying_strftime; | |
| 797 # else | |
| 798 /* Fall through. */ | |
| 799 # endif | |
| 604 | 800 #endif |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
801 case 'D': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
802 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
803 goto bad_format; |
| 604 | 804 subfmt = "%m/%d/%y"; |
| 805 goto subformat; | |
| 806 | |
| 807 case 'd': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
808 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
809 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
810 |
| 604 | 811 DO_NUMBER (2, tp->tm_mday); |
| 812 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
813 case 'e': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
814 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
815 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
816 |
| 657 | 817 DO_NUMBER_SPACEPAD (2, tp->tm_mday); |
| 176 | 818 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
819 /* All numeric formats set DIGITS and NUMBER_VALUE and then |
| 604 | 820 jump to one of these two labels. */ |
| 821 | |
| 657 | 822 do_number_spacepad: |
| 813 | 823 /* Force `_' flag unless overwritten by `0' flag. */ |
| 824 if (pad != '0') | |
| 825 pad = '_'; | |
| 176 | 826 |
| 604 | 827 do_number: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
828 /* Format the number according to the MODIFIER flag. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
829 |
| 794 | 830 if (modifier == 'O' && 0 <= number_value) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
831 { |
| 1109 | 832 #ifdef _NL_CURRENT |
| 794 | 833 /* Get the locale specific alternate representation of |
| 834 the number NUMBER_VALUE. If none exist NULL is returned. */ | |
| 835 const char *cp = _nl_get_alt_digit (number_value); | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
836 |
| 794 | 837 if (cp != NULL) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
838 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
839 size_t digitlen = strlen (cp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
840 if (digitlen != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
841 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
842 cpy (digitlen, cp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
843 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
844 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
845 } |
| 1109 | 846 #else |
| 847 # if HAVE_STRFTIME | |
| 848 goto underlying_strftime; | |
| 849 # endif | |
| 850 #endif | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
851 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
852 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
853 unsigned int u = number_value; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
854 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
855 bufp = buf + sizeof (buf); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
856 negative_number = number_value < 0; |
| 604 | 857 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
858 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
859 u = -u; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
860 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
861 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
862 *--bufp = u % 10 + '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
863 while ((u /= 10) != 0); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
864 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
865 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
866 do_number_sign_and_padding: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
867 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
868 *--bufp = '-'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
869 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
870 if (pad != '-') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
871 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
872 int padding = digits - (buf + sizeof (buf) - bufp); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
873 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
874 if (pad == '_') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
875 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
876 while (0 < padding--) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
877 *--bufp = ' '; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
878 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
879 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
880 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
881 bufp += negative_number; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
882 while (0 < padding--) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
883 *--bufp = '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
884 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
885 *--bufp = '-'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
886 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
887 } |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
888 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
889 cpy (buf + sizeof (buf) - bufp, bufp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
890 break; |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
891 |
| 1109 | 892 case 'F': |
| 893 if (modifier != 0) | |
| 894 goto bad_format; | |
| 895 subfmt = "%Y-%m-%d"; | |
| 896 goto subformat; | |
| 604 | 897 |
| 898 case 'H': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
899 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
900 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
901 |
| 604 | 902 DO_NUMBER (2, tp->tm_hour); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
903 |
| 604 | 904 case 'I': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
905 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
906 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
907 |
| 604 | 908 DO_NUMBER (2, hour12); |
| 909 | |
| 910 case 'k': /* GNU extension. */ | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
911 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
912 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
913 |
| 657 | 914 DO_NUMBER_SPACEPAD (2, tp->tm_hour); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
915 |
| 604 | 916 case 'l': /* GNU extension. */ |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
917 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
918 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
919 |
| 657 | 920 DO_NUMBER_SPACEPAD (2, hour12); |
| 604 | 921 |
| 922 case 'j': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
923 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
924 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
925 |
| 604 | 926 DO_NUMBER (3, 1 + tp->tm_yday); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
927 |
| 604 | 928 case 'M': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
929 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
930 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
931 |
| 604 | 932 DO_NUMBER (2, tp->tm_min); |
| 933 | |
| 934 case 'm': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
935 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
936 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
937 |
| 604 | 938 DO_NUMBER (2, tp->tm_mon + 1); |
| 939 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
940 case 'n': /* POSIX.2 extension. */ |
| 604 | 941 add (1, *p = '\n'); |
| 942 break; | |
| 943 | |
| 813 | 944 case 'P': |
| 945 to_lowcase = 1; | |
| 1109 | 946 #if !defined _NL_CURRENT && HAVE_STRFTIME |
| 947 format_char = 'p'; | |
| 948 #endif | |
| 813 | 949 /* FALLTHROUGH */ |
| 950 | |
| 604 | 951 case 'p': |
| 1058 | 952 if (change_case) |
| 953 { | |
| 954 to_uppcase = 0; | |
| 955 to_lowcase = 1; | |
| 956 } | |
| 1109 | 957 #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
|
958 cpy (ap_len, ampm); |
| 604 | 959 break; |
| 1109 | 960 #else |
| 961 goto underlying_strftime; | |
| 962 #endif | |
| 9 | 963 |
| 604 | 964 case 'R': /* GNU extension. */ |
| 965 subfmt = "%H:%M"; | |
| 966 goto subformat; | |
| 967 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
968 case 'r': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
969 #ifdef _NL_CURRENT |
| 794 | 970 if (*(subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM)) == '\0') |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
971 #endif |
| 794 | 972 subfmt = "%I:%M:%S %p"; |
| 604 | 973 goto subformat; |
| 974 | |
| 975 case 'S': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
976 if (modifier == 'E') |
| 794 | 977 goto bad_format; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
978 |
| 604 | 979 DO_NUMBER (2, tp->tm_sec); |
| 980 | |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
981 case 's': /* GNU extension. */ |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
982 { |
|
726
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
983 struct tm ltm; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
984 time_t t; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
985 |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
986 ltm = *tp; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
987 t = mktime (<m); |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
988 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
989 /* 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
|
990 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
|
991 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
992 bufp = buf + sizeof (buf); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
993 negative_number = t < 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
994 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
995 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
996 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
997 int d = t % 10; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
998 t /= 10; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
999 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1000 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1001 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1002 d = -d; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1003 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1004 /* Adjust if division truncates to minus infinity. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1005 if (0 < -1 % 10 && d < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1006 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1007 t++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1008 d += 10; |
|
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 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1011 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1012 *--bufp = d + '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1013 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1014 while (t != 0); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1015 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1016 digits = 1; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1017 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
|
1018 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1019 |
| 604 | 1020 case 'X': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1021 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1022 goto bad_format; |
| 604 | 1023 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1024 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1025 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_T_FMT)) != '\0')) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1026 subfmt = _NL_CURRENT (LC_TIME, T_FMT); |
| 604 | 1027 goto subformat; |
| 1109 | 1028 #else |
| 1029 # if HAVE_STRFTIME | |
| 1030 goto underlying_strftime; | |
| 1031 # else | |
| 1032 /* Fall through. */ | |
| 1033 # endif | |
| 604 | 1034 #endif |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1035 case 'T': /* POSIX.2 extension. */ |
| 604 | 1036 subfmt = "%H:%M:%S"; |
| 1037 goto subformat; | |
| 1038 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1039 case 't': /* POSIX.2 extension. */ |
| 604 | 1040 add (1, *p = '\t'); |
| 1041 break; | |
| 1042 | |
| 1109 | 1043 case 'f': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1044 case 'u': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1045 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
|
1046 |
| 604 | 1047 case 'U': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1048 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1049 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1050 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1051 DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); |
| 604 | 1052 |
| 1053 case 'V': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1054 case 'g': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1055 case 'G': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1056 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1057 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1058 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1059 int year = tp->tm_year + TM_YEAR_BASE; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1060 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
|
1061 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1062 if (days < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1063 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1064 /* This ISO week belongs to the previous year. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1065 year--; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1066 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
|
1067 tp->tm_wday); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1068 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1069 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1070 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1071 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
|
1072 tp->tm_wday); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1073 if (0 <= d) |
|
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 /* This ISO week belongs to the next year. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1076 year++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1077 days = d; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1078 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1079 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1080 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1081 switch (*f) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1082 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1083 case 'g': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1084 DO_NUMBER (2, (year % 100 + 100) % 100); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1085 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1086 case 'G': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1087 DO_NUMBER (1, year); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1088 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1089 default: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1090 DO_NUMBER (2, days / 7 + 1); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1091 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1092 } |
| 604 | 1093 |
| 1094 case 'W': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1095 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1096 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1097 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1098 DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); |
| 604 | 1099 |
| 1100 case 'w': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1101 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1102 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1103 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1104 DO_NUMBER (1, tp->tm_wday); |
| 604 | 1105 |
| 1106 case 'Y': | |
| 794 | 1107 if (modifier == 'E') |
| 1108 { | |
| 1109 | 1109 #if HAVE_STRUCT_ERA_ENTRY |
| 794 | 1110 struct era_entry *era = _nl_get_era_entry (tp); |
| 1111 if (era) | |
| 1112 { | |
| 1113 subfmt = strchr (era->name_fmt, '\0') + 1; | |
| 1114 goto subformat; | |
| 1115 } | |
| 1109 | 1116 #else |
| 1117 # if HAVE_STRFTIME | |
| 1118 goto underlying_strftime; | |
| 1119 # endif | |
| 1120 #endif | |
| 794 | 1121 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1122 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1123 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1124 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1125 DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); |
| 604 | 1126 |
| 1127 case 'y': | |
| 794 | 1128 if (modifier == 'E') |
| 1129 { | |
| 1109 | 1130 #if HAVE_STRUCT_ERA_ENTRY |
| 794 | 1131 struct era_entry *era = _nl_get_era_entry (tp); |
| 1132 if (era) | |
| 1133 { | |
| 1134 int delta = tp->tm_year - era->start_date[0]; | |
| 1135 DO_NUMBER (1, (era->offset | |
| 1136 + (era->direction == '-' ? -delta : delta))); | |
| 1137 } | |
| 1109 | 1138 #else |
| 1139 # if HAVE_STRFTIME | |
| 1140 goto underlying_strftime; | |
| 1141 # endif | |
| 1142 #endif | |
| 794 | 1143 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1144 DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); |
| 604 | 1145 |
| 1146 case 'Z': | |
| 1058 | 1147 if (change_case) |
| 1148 { | |
| 1149 to_uppcase = 0; | |
| 1150 to_lowcase = 1; | |
| 1151 } | |
| 804 | 1152 cpy (zonelen, zone); |
| 604 | 1153 break; |
| 1154 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1155 case 'z': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1156 if (tp->tm_isdst < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1157 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1158 |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1159 { |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1160 int diff; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1161 #if HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1162 diff = tp->tm_gmtoff; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1163 #else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1164 struct tm gtm; |
|
726
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
1165 struct tm ltm; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
1166 time_t lt; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
1167 |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
1168 ltm = *tp; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
1169 lt = mktime (<m); |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1170 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1171 if (lt == (time_t) -1) |
| 687 | 1172 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1173 /* mktime returns -1 for errors, but -1 is also a |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1174 valid time_t value. Check whether an error really |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1175 occurred. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1176 struct tm tm; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1177 localtime_r (<, &tm); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1178 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1179 if ((ltm.tm_sec ^ tm.tm_sec) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1180 | (ltm.tm_min ^ tm.tm_min) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1181 | (ltm.tm_hour ^ tm.tm_hour) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1182 | (ltm.tm_mday ^ tm.tm_mday) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1183 | (ltm.tm_mon ^ tm.tm_mon) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1184 | (ltm.tm_year ^ tm.tm_year)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1185 break; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1186 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1187 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1188 if (! gmtime_r (<, >m)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1189 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1190 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1191 diff = tm_diff (<m, >m); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1192 #endif |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1193 |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1194 if (diff < 0) |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1195 { |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1196 add (1, *p = '-'); |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1197 diff = -diff; |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1198 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1199 else |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1200 add (1, *p = '+'); |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1201 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1202 diff /= 60; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1203 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
|
1204 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
1205 |
| 794 | 1206 case '\0': /* GNU extension: % at end of format. */ |
| 1207 --f; | |
| 1208 /* Fall through. */ | |
| 604 | 1209 default: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1210 /* Unknown format; output the format, including the '%', |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1211 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
|
1212 multibyte string has been misparsed. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1213 bad_format: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1214 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1215 int flen; |
| 794 | 1216 for (flen = 1; f[1 - flen] != '%'; flen++) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1217 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1218 cpy (flen, &f[1 - flen]); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1219 } |
| 604 | 1220 break; |
| 9 | 1221 } |
| 1222 } | |
| 604 | 1223 |
| 1224 if (p) | |
| 1225 *p = '\0'; | |
| 1226 return i; | |
| 9 | 1227 } |