Mercurial > hg > octave-shane > gnulib-hg
annotate lib/strftime.c @ 816:ef7796f30b31
another new version ...
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Wed, 18 Dec 1996 16:54:48 +0000 |
| parents | 7d01ef99f1b8 |
| children | 91a2ff2f432c |
| rev | line source |
|---|---|
| 604 | 1 /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. |
| 9 | 2 |
| 782 | 3 NOTE: The canonical source of this file is maintained with the GNU C |
| 4 Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. | |
| 9 | 5 |
| 782 | 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 |
| 782 | 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. | |
| 15 | |
| 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 Foundation, | |
| 18 Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | |
| 9 | 19 |
| 125 | 20 #ifdef HAVE_CONFIG_H |
| 604 | 21 # include <config.h> |
| 22 #endif | |
| 23 | |
| 24 #ifdef _LIBC | |
| 25 # define HAVE_LIMITS_H 1 | |
| 26 # define HAVE_MBLEN 1 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
27 # define HAVE_MBRLEN 1 |
| 794 | 28 # define HAVE_STRUCT_ERA_ENTRY 1 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
29 # define HAVE_TM_GMTOFF 1 |
| 604 | 30 # define HAVE_TM_ZONE 1 |
| 813 | 31 # define HAVE_TZNAME 1 |
| 32 # define HAVE_TZSET 1 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
33 # define MULTIBYTE_IS_FORMAT_SAFE 1 |
| 604 | 34 # define STDC_HEADERS 1 |
| 35 # include <ansidecl.h> | |
| 36 # include "../locale/localeinfo.h" | |
| 125 | 37 #endif |
| 38 | |
| 813 | 39 #include <ctype.h> |
| 604 | 40 #include <sys/types.h> /* Some systems define `time_t' here. */ |
| 41 | |
| 42 #ifdef TIME_WITH_SYS_TIME | |
| 43 # include <sys/time.h> | |
| 44 # include <time.h> | |
| 9 | 45 #else |
| 604 | 46 # ifdef HAVE_SYS_TIME_H |
| 47 # include <sys/time.h> | |
| 48 # else | |
| 49 # include <time.h> | |
| 50 # endif | |
| 51 #endif | |
| 803 | 52 #if HAVE_TZNAME |
|
801
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
53 extern char *tzname[]; |
|
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
54 #endif |
|
da8cea3a8036
[HAVE_TZNAME]: Declare tzname.
Jim Meyering <jim@meyering.net>
parents:
797
diff
changeset
|
55 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
56 /* Do multibyte processing if multibytes are supported, unless |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
57 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
|
58 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
|
59 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
|
60 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
|
61 with other C libraries that use unsafe encodings. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
62 #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
|
63 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
64 #if DO_MULTIBYTE |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
65 # if HAVE_MBRLEN |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
66 # include <wchar.h> |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
67 # else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
68 /* Simulate mbrlen with mblen as best we can. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
69 # define mbstate_t int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
70 # define mbrlen(s, n, ps) mblen (s, n) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
71 # define mbsinit(ps) (*(ps) == 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
72 # endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
73 static const mbstate_t mbstate_zero; |
| 604 | 74 #endif |
| 75 | |
| 76 #if HAVE_LIMITS_H | |
| 77 # include <limits.h> | |
| 9 | 78 #endif |
| 79 | |
| 604 | 80 #if STDC_HEADERS |
| 81 # include <stddef.h> | |
| 82 # include <stdlib.h> | |
| 83 # include <string.h> | |
| 84 #else | |
| 813 | 85 # define memcpy(d, s, n) bcopy ((s), (d), (n)) |
| 176 | 86 #endif |
| 87 | |
| 604 | 88 #ifndef __P |
| 657 | 89 #if defined (__GNUC__) || (defined (__STDC__) && __STDC__) |
| 90 #define __P(args) args | |
| 91 #else | |
| 92 #define __P(args) () | |
| 93 #endif /* GCC. */ | |
| 604 | 94 #endif /* Not __P. */ |
| 95 | |
| 96 #ifndef PTR | |
| 657 | 97 #ifdef __STDC__ |
| 98 #define PTR void * | |
| 99 #else | |
| 100 #define PTR char * | |
| 101 #endif | |
| 9 | 102 #endif |
| 103 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
104 #ifndef CHAR_BIT |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
105 #define CHAR_BIT 8 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
106 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
107 |
| 816 | 108 #ifndef NULL |
| 109 #define NULL 0 | |
| 110 #endif | |
| 111 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
112 #define TYPE_SIGNED(t) ((t) -1 < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
113 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
114 /* 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
|
115 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
|
116 302 / 1000 is log10 (2) rounded up; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
117 add one for integer division truncation; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
118 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
|
119 #define INT_STRLEN_BOUND(t) \ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
120 ((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
|
121 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
122 #define TM_YEAR_BASE 1900 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
123 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
124 #ifndef __isleap |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
125 /* 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
|
126 except every 100th isn't, and every 400th is). */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
127 #define __isleap(year) \ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
128 ((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
|
129 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
130 |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
131 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
132 #ifdef _LIBC |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
133 # define gmtime_r __gmtime_r |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
134 # define localtime_r __localtime_r |
| 813 | 135 extern int __tz_compute __P ((time_t timer, const struct tm *tm)); |
| 816 | 136 # define tzname __tzname |
| 137 # define tzset __tzset | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
138 #else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
139 # if ! HAVE_LOCALTIME_R |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
140 # if ! HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
141 /* Approximate gmtime_r as best we can in its absence. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
142 #define gmtime_r my_gmtime_r |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
143 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
|
144 static struct tm * |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
145 gmtime_r (t, tp) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
146 const time_t *t; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
147 struct tm *tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
148 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
149 struct tm *l = gmtime (t); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
150 if (! l) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
151 return 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
152 *tp = *l; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
153 return tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
154 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
155 # endif /* ! HAVE_TM_GMTOFF */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
156 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
157 /* Approximate localtime_r as best we can in its absence. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
158 #define localtime_r my_localtime_r |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
159 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
|
160 static struct tm * |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
161 localtime_r (t, tp) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
162 const time_t *t; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
163 struct tm *tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
164 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
165 struct tm *l = localtime (t); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
166 if (! l) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
167 return 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
168 *tp = *l; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
169 return tp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
170 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
171 # endif /* ! HAVE_LOCALTIME_R */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
172 #endif /* ! defined (_LIBC) */ |
| 9 | 173 |
| 174 | |
| 813 | 175 #if !defined (memset) && !defined (HAVE_MEMSET) && !defined (_LIBC) |
| 176 /* Some systems lack the `memset' function and we don't want to | |
| 177 introduce additional dependencies. */ | |
| 178 static const char spaces[16] = " "; | |
| 179 | |
| 180 # define memset_space(P, Len) \ | |
| 181 do { \ | |
| 182 int _len = (Len); \ | |
| 183 \ | |
| 184 do \ | |
| 185 { \ | |
| 186 int _this = _len > 16 ? 16 : _len; \ | |
| 187 memcpy ((P), spaces, _this); \ | |
| 188 (P) += _this; \ | |
| 189 _len -= _this; \ | |
| 190 } \ | |
| 191 while (_len > 0); \ | |
| 192 } while (0) | |
| 193 #else | |
| 194 # define memset_space(P, Len) memset ((P), ' ', (Len)) | |
| 195 #endif | |
| 196 | |
| 197 #define add(n, f) \ | |
| 604 | 198 do \ |
| 199 { \ | |
| 813 | 200 int _n = (n); \ |
| 201 int _delta = width - _n; \ | |
| 816 | 202 int _incr = _n + (_delta > 0 ? _delta : 0); \ |
| 203 if (i + _incr >= maxsize) \ | |
| 604 | 204 return 0; \ |
| 816 | 205 if (p) \ |
| 206 { \ | |
| 207 if (_delta > 0) \ | |
| 208 memset_space (p, _delta); \ | |
| 209 f; \ | |
| 210 p += _n; \ | |
| 211 } \ | |
| 212 i += _incr; \ | |
| 604 | 213 } while (0) |
| 813 | 214 |
| 215 #define cpy(n, s) \ | |
| 216 add ((n), \ | |
| 217 if (to_lowcase) \ | |
| 218 memcpy_lowcase (p, (s), _n); \ | |
| 816 | 219 else if (to_uppcase) \ |
| 220 memcpy_uppcase (p, (s), _n); \ | |
| 813 | 221 else \ |
| 222 memcpy ((PTR) p, (PTR) (s), _n)) | |
| 223 | |
| 224 | |
| 225 | |
| 226 #ifdef _LIBC | |
| 227 # define TOUPPER(Ch) toupper (Ch) | |
| 228 # define TOLOWER(Ch) tolower (Ch) | |
| 229 #else | |
| 230 # define TOUPPER(Ch) (islower (Ch) ? toupper (Ch) : (Ch)) | |
| 231 # define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) | |
| 232 #endif | |
| 233 | |
| 234 static char *memcpy_lowcase __P ((char *dest, const char *src, size_t len)); | |
| 235 | |
| 236 static char * | |
| 237 memcpy_lowcase (dest, src, len) | |
| 238 char *dest; | |
| 239 const char *src; | |
| 240 size_t len; | |
| 241 { | |
| 242 while (len-- > 0) | |
| 243 dest[len] = TOLOWER (src[len]); | |
| 244 return dest; | |
| 245 } | |
| 9 | 246 |
| 816 | 247 static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len)); |
| 248 | |
| 249 static char * | |
| 250 memcpy_uppcase (dest, src, len) | |
| 251 char *dest; | |
| 252 const char *src; | |
| 253 size_t len; | |
| 254 { | |
| 255 while (len-- > 0) | |
| 256 dest[len] = TOUPPER (src[len]); | |
| 257 return dest; | |
| 258 } | |
| 259 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
260 #if ! HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
261 /* Yield the difference between *A and *B, |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
262 measured in seconds, ignoring leap seconds. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
263 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
|
264 static int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
265 tm_diff (a, b) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
266 const struct tm *a; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
267 const struct tm *b; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
268 { |
| 794 | 269 /* Compute intervening leap days correctly even if year is negative. |
| 270 Take care to avoid int overflow in leap day calculations, | |
| 271 but it's OK to assume that A and B are close to each other. */ | |
| 272 int a4 = (a->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (a->tm_year & 3); | |
| 273 int b4 = (b->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (b->tm_year & 3); | |
| 274 int a100 = a4 / 25 - (a4 % 25 < 0); | |
| 275 int b100 = b4 / 25 - (b4 % 25 < 0); | |
| 276 int a400 = a100 >> 2; | |
| 277 int b400 = b100 >> 2; | |
| 278 int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); | |
| 279 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
|
280 int days = (365 * years + intervening_leap_days |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
281 + (a->tm_yday - b->tm_yday)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
282 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
|
283 + (a->tm_min - b->tm_min)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
284 + (a->tm_sec - b->tm_sec)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
285 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
286 #endif /* ! HAVE_TM_GMTOFF */ |
| 9 | 287 |
| 604 | 288 |
| 9 | 289 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
290 /* 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
|
291 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
|
292 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
|
293 be as small as YDAY_MINIMUM. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
294 #define ISO_WEEK_START_WDAY 1 /* Monday */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
295 #define ISO_WEEK1_WDAY 4 /* Thursday */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
296 #define YDAY_MINIMUM (-366) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
297 static int iso_week_days __P ((int, int)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
298 #ifdef __GNUC__ |
| 604 | 299 inline |
| 300 #endif | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
301 static int |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
302 iso_week_days (yday, wday) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
303 int yday; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
304 int wday; |
| 604 | 305 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
306 /* 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
|
307 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
|
308 return (yday |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
309 - (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
|
310 + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
311 } |
| 9 | 312 |
| 313 | |
| 604 | 314 #ifndef _NL_CURRENT |
| 315 static char const weekday_name[][10] = | |
| 316 { | |
| 317 "Sunday", "Monday", "Tuesday", "Wednesday", | |
| 318 "Thursday", "Friday", "Saturday" | |
| 319 }; | |
| 320 static char const month_name[][10] = | |
| 321 { | |
| 322 "January", "February", "March", "April", "May", "June", | |
| 323 "July", "August", "September", "October", "November", "December" | |
| 324 }; | |
| 325 #endif | |
| 9 | 326 |
| 604 | 327 /* Write information from TP into S according to the format |
| 328 string FORMAT, writing no more that MAXSIZE characters | |
| 329 (including the terminating '\0') and returning number of | |
| 330 characters written. If S is NULL, nothing will be written | |
| 331 anywhere, so to determine how many characters would be | |
| 332 written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */ | |
| 333 size_t | |
| 334 strftime (s, maxsize, format, tp) | |
| 335 char *s; | |
| 336 size_t maxsize; | |
| 337 const char *format; | |
| 813 | 338 const struct tm *tp; |
| 604 | 339 { |
| 340 int hour12 = tp->tm_hour; | |
| 341 #ifdef _NL_CURRENT | |
| 342 const char *const a_wkday = _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday); | |
| 343 const char *const f_wkday = _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday); | |
| 344 const char *const a_month = _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon); | |
| 345 const char *const f_month = _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon); | |
| 346 const char *const ampm = _NL_CURRENT (LC_TIME, | |
| 347 hour12 > 11 ? PM_STR : AM_STR); | |
| 794 | 348 size_t aw_len = strlen (a_wkday); |
| 349 size_t am_len = strlen (a_month); | |
| 604 | 350 size_t ap_len = strlen (ampm); |
| 351 #else | |
| 352 const char *const f_wkday = weekday_name[tp->tm_wday]; | |
| 353 const char *const f_month = month_name[tp->tm_mon]; | |
| 354 const char *const a_wkday = f_wkday; | |
| 355 const char *const a_month = f_month; | |
| 356 const char *const ampm = "AMPM" + 2 * (hour12 > 11); | |
| 357 size_t aw_len = 3; | |
| 358 size_t am_len = 3; | |
| 359 size_t ap_len = 2; | |
| 360 #endif | |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
361 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
|
362 size_t month_len = strlen (f_month); |
| 604 | 363 const char *zone; |
| 364 size_t zonelen; | |
| 813 | 365 size_t i = 0; |
| 366 char *p = s; | |
| 367 const char *f; | |
|
582
3ec26150a8d6
(mon_week_ISO): New function to implement new %V format.
Jim Meyering <jim@meyering.net>
parents:
581
diff
changeset
|
368 |
| 813 | 369 zone = NULL; |
| 370 #if !defined _LIBC && HAVE_TM_ZONE | |
| 371 /* XXX We have some problems here. First, the string pointed to by | |
| 372 tm_zone is dynamically allocated while loading the zone data. But | |
| 373 when another zone is loaded since the information in TP were | |
| 374 computed this would be a stale pointer. | |
| 375 The second problem is the POSIX test suite which assumes setting | |
| 376 the environment variable TZ to a new value before calling strftime() | |
| 377 will influence the result (the %Z format) even if the information in | |
| 378 TP is computed with a totally different time zone. --drepper@gnu */ | |
| 604 | 379 zone = (const char *) tp->tm_zone; |
| 380 #endif | |
| 381 #if HAVE_TZNAME | |
| 813 | 382 /* POSIX.1 8.1.1 requires that whenever strftime() is called, the |
| 383 time zone names contained in the external variable `tzname' shall | |
| 384 be set as if the tzset() function had been called. */ | |
| 385 # if HAVE_TZSET | |
| 386 tzset (); | |
| 387 # endif | |
| 388 | |
| 604 | 389 if (!(zone && *zone) && tp->tm_isdst >= 0) |
| 390 zone = tzname[tp->tm_isdst]; | |
| 391 #endif | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
392 if (! zone) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
393 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
|
394 |
| 604 | 395 zonelen = strlen (zone); |
| 396 | |
| 397 if (hour12 > 12) | |
| 398 hour12 -= 12; | |
| 399 else | |
| 400 if (hour12 == 0) hour12 = 12; | |
| 401 | |
| 402 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
|
403 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
404 int pad; /* Padding for number ('-', '_', or 0). */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
405 int modifier; /* Field modifier ('E', 'O', or 0). */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
406 int digits; /* Max digits for numeric format. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
407 int number_value; /* Numeric value to be printed. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
408 int negative_number; /* 1 if the number is negative. */ |
| 604 | 409 const char *subfmt; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
410 char *bufp; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
411 char buf[1 + (sizeof (int) < sizeof (time_t) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
412 ? INT_STRLEN_BOUND (time_t) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
413 : INT_STRLEN_BOUND (int))]; |
| 813 | 414 int width = -1; |
| 415 int to_lowcase = 0; | |
| 816 | 416 int to_uppcase = 0; |
| 9 | 417 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
418 #if DO_MULTIBYTE |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
419 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
420 switch (*f) |
| 604 | 421 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
422 case '%': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
423 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
424 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
425 case '\a': case '\b': case '\t': case '\n': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
426 case '\v': case '\f': case '\r': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
427 case ' ': case '!': case '"': case '#': case '&': case'\'': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
428 case '(': case ')': case '*': case '+': case ',': case '-': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
429 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
|
430 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
|
431 case ':': case ';': case '<': case '=': case '>': case '?': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
432 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
|
433 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
|
434 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
|
435 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
|
436 case 'Y': case 'Z': case '[': case'\\': case ']': case '^': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
437 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 case '~': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
443 /* 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
|
444 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
|
445 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
|
446 not be analyzed further. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
447 add (1, *p = *f); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
448 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
449 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
450 default: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
451 /* 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
|
452 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
|
453 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
454 mbstate_t mbstate = mbstate_zero; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
455 size_t len = 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
456 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
457 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
458 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
459 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
|
460 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
461 if (bytes == 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
462 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
463 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
464 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
|
465 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
466 len++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
467 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
468 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
469 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
470 len += bytes; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
471 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
472 while (! mbsinit (&mbstate)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
473 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
474 cpy (len, f); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
475 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
476 } |
| 604 | 477 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
478 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
479 #else /* ! DO_MULTIBYTE */ |
| 9 | 480 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
481 /* 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
|
482 safe for formats, so any non-'%' byte can be copied through. */ |
| 604 | 483 if (*f != '%') |
| 484 { | |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
485 add (1, *p = *f); |
| 604 | 486 continue; |
| 487 } | |
| 9 | 488 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
489 #endif /* ! DO_MULTIBYTE */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
490 |
| 604 | 491 /* Check for flags that can modify a number format. */ |
| 813 | 492 while (1) |
| 9 | 493 { |
| 816 | 494 switch (*++f) |
| 813 | 495 { |
| 496 case '_': | |
| 497 case '-': | |
| 498 case '0': | |
| 816 | 499 pad = *f; |
| 500 continue; | |
| 501 | |
| 502 case '^': | |
| 503 to_uppcase = 1; | |
| 504 continue; | |
| 813 | 505 |
| 506 default: | |
| 507 pad = 0; | |
| 508 break; | |
| 509 } | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
510 break; |
| 813 | 511 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
512 |
| 813 | 513 /* As a GNU extension we allow to specify the field width. */ |
| 514 if (isdigit (*f)) | |
| 515 { | |
| 516 width = 0; | |
| 517 do | |
| 518 { | |
| 519 width *= 10; | |
| 520 width += *f - '0'; | |
| 521 } | |
| 522 while (isdigit (*++f)); | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
523 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
524 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
525 /* Check for modifiers. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
526 switch (*f) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
527 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
528 case 'E': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
529 case 'O': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
530 modifier = *f++; |
| 604 | 531 break; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
532 |
| 604 | 533 default: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
534 modifier = 0; |
| 604 | 535 break; |
| 536 } | |
| 9 | 537 |
| 604 | 538 /* Now do the specified format. */ |
| 539 switch (*f) | |
| 540 { | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
541 #define DO_NUMBER(d, v) \ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
542 digits = d; number_value = v; goto do_number |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
543 #define DO_NUMBER_SPACEPAD(d, v) \ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
544 digits = d; number_value = v; goto do_number_spacepad |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
545 |
| 604 | 546 case '%': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
547 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
548 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
549 add (1, *p = *f); |
| 604 | 550 break; |
| 551 | |
| 552 case 'a': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
553 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
554 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
555 cpy (aw_len, a_wkday); |
| 604 | 556 break; |
| 557 | |
| 558 case 'A': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
559 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
560 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
561 cpy (wkday_len, f_wkday); |
| 604 | 562 break; |
| 563 | |
| 564 case 'b': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
565 case 'h': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
566 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
567 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
568 cpy (am_len, a_month); |
| 604 | 569 break; |
| 570 | |
| 571 case 'B': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
572 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
573 goto bad_format; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
574 cpy (month_len, f_month); |
| 604 | 575 break; |
| 9 | 576 |
| 604 | 577 case 'c': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
578 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
579 goto bad_format; |
| 604 | 580 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
581 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
582 && *(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
|
583 subfmt = _NL_CURRENT (LC_TIME, D_T_FMT); |
| 604 | 584 #else |
|
797
a82f1b225592
(strftime): Remove " %Z" part of format for %c. Suggestion from Paul Eggert.
Jim Meyering <jim@meyering.net>
parents:
794
diff
changeset
|
585 subfmt = "%a %b %e %H:%M:%S %Y"; |
| 604 | 586 #endif |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
587 |
| 604 | 588 subformat: |
| 589 { | |
| 816 | 590 char *old_start = p; |
| 813 | 591 size_t len = strftime (NULL, maxsize - i, subfmt, tp); |
| 604 | 592 if (len == 0 && *subfmt) |
| 593 return 0; | |
| 813 | 594 add (len, strftime (p, maxsize - i, subfmt, tp)); |
| 816 | 595 |
| 596 if (to_uppcase) | |
| 597 while (old_start < p) | |
| 598 { | |
| 599 *old_start = TOUPPER (*old_start); | |
| 600 ++old_start; | |
| 601 } | |
| 604 | 602 } |
| 603 break; | |
| 604 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
605 case 'C': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
606 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
607 goto bad_format; |
| 794 | 608 #if HAVE_STRUCT_ERA_ENTRY |
| 609 if (modifier == 'E') | |
| 610 { | |
| 611 struct era_entry *era = _nl_get_era_entry (tp); | |
| 612 if (era) | |
| 613 { | |
| 614 size_t len = strlen (era->name_fmt); | |
| 615 cpy (len, era->name_fmt); | |
| 616 break; | |
| 617 } | |
| 618 } | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
619 #endif |
|
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 int year = tp->tm_year + TM_YEAR_BASE; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
622 DO_NUMBER (1, year / 100 - (year % 100 < 0)); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
623 } |
| 9 | 624 |
| 604 | 625 case 'x': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
626 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
627 goto bad_format; |
| 604 | 628 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
629 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
630 && *(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
|
631 subfmt = _NL_CURRENT (LC_TIME, D_FMT); |
| 604 | 632 goto subformat; |
| 633 #endif | |
| 634 /* Fall through. */ | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
635 case 'D': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
636 if (modifier != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
637 goto bad_format; |
| 604 | 638 subfmt = "%m/%d/%y"; |
| 639 goto subformat; | |
| 640 | |
| 641 case 'd': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
642 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
643 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
644 |
| 604 | 645 DO_NUMBER (2, tp->tm_mday); |
| 646 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
647 case 'e': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
648 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
649 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
650 |
| 657 | 651 DO_NUMBER_SPACEPAD (2, tp->tm_mday); |
| 176 | 652 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
653 /* All numeric formats set DIGITS and NUMBER_VALUE and then |
| 604 | 654 jump to one of these two labels. */ |
| 655 | |
| 657 | 656 do_number_spacepad: |
| 813 | 657 /* Force `_' flag unless overwritten by `0' flag. */ |
| 658 if (pad != '0') | |
| 659 pad = '_'; | |
| 176 | 660 |
| 604 | 661 do_number: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
662 /* Format the number according to the MODIFIER flag. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
663 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
664 #ifdef _NL_CURRENT |
| 794 | 665 if (modifier == 'O' && 0 <= number_value) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
666 { |
| 794 | 667 /* Get the locale specific alternate representation of |
| 668 the number NUMBER_VALUE. If none exist NULL is returned. */ | |
| 669 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
|
670 |
| 794 | 671 if (cp != NULL) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
672 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
673 size_t digitlen = strlen (cp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
674 if (digitlen != 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
675 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
676 cpy (digitlen, cp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
677 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
678 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
679 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
680 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
681 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
682 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
683 unsigned int u = number_value; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
684 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
685 bufp = buf + sizeof (buf); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
686 negative_number = number_value < 0; |
| 604 | 687 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
688 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
689 u = -u; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
690 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
691 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
692 *--bufp = u % 10 + '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
693 while ((u /= 10) != 0); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
694 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
695 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
696 do_number_sign_and_padding: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
697 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
698 *--bufp = '-'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
699 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
700 if (pad != '-') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
701 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
702 int padding = digits - (buf + sizeof (buf) - bufp); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
703 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
704 if (pad == '_') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
705 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
706 while (0 < padding--) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
707 *--bufp = ' '; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
708 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
709 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
710 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
711 bufp += negative_number; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
712 while (0 < padding--) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
713 *--bufp = '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
714 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
715 *--bufp = '-'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
716 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
717 } |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
718 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
719 cpy (buf + sizeof (buf) - bufp, bufp); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
720 break; |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
721 |
| 604 | 722 |
| 723 case 'H': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
724 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
725 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
726 |
| 604 | 727 DO_NUMBER (2, tp->tm_hour); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
728 |
| 604 | 729 case 'I': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
730 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
731 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
732 |
| 604 | 733 DO_NUMBER (2, hour12); |
| 734 | |
| 735 case 'k': /* GNU extension. */ | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
736 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
737 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
738 |
| 657 | 739 DO_NUMBER_SPACEPAD (2, tp->tm_hour); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
740 |
| 604 | 741 case 'l': /* GNU extension. */ |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
742 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
743 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
744 |
| 657 | 745 DO_NUMBER_SPACEPAD (2, hour12); |
| 604 | 746 |
| 747 case 'j': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
748 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
749 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
750 |
| 604 | 751 DO_NUMBER (3, 1 + tp->tm_yday); |
|
546
baaeb11e50e5
(add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents:
307
diff
changeset
|
752 |
| 604 | 753 case 'M': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
754 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
755 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
756 |
| 604 | 757 DO_NUMBER (2, tp->tm_min); |
| 758 | |
| 759 case 'm': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
760 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
761 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
762 |
| 604 | 763 DO_NUMBER (2, tp->tm_mon + 1); |
| 764 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
765 case 'n': /* POSIX.2 extension. */ |
| 604 | 766 add (1, *p = '\n'); |
| 767 break; | |
| 768 | |
| 813 | 769 case 'P': |
| 770 to_lowcase = 1; | |
| 771 /* FALLTHROUGH */ | |
| 772 | |
| 604 | 773 case 'p': |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
774 cpy (ap_len, ampm); |
| 604 | 775 break; |
| 9 | 776 |
| 604 | 777 case 'R': /* GNU extension. */ |
| 778 subfmt = "%H:%M"; | |
| 779 goto subformat; | |
| 780 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
781 case 'r': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
782 #ifdef _NL_CURRENT |
| 794 | 783 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
|
784 #endif |
| 794 | 785 subfmt = "%I:%M:%S %p"; |
| 604 | 786 goto subformat; |
| 787 | |
| 788 case 'S': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
789 if (modifier == 'E') |
| 794 | 790 goto bad_format; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
791 |
| 604 | 792 DO_NUMBER (2, tp->tm_sec); |
| 793 | |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
794 case 's': /* GNU extension. */ |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
795 { |
|
726
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
796 struct tm ltm; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
797 time_t t; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
798 |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
799 ltm = *tp; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
800 t = mktime (<m); |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
801 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
802 /* 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
|
803 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
|
804 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
805 bufp = buf + sizeof (buf); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
806 negative_number = t < 0; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
807 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
808 do |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
809 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
810 int d = t % 10; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
811 t /= 10; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
812 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
813 if (negative_number) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
814 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
815 d = -d; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
816 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
817 /* Adjust if division truncates to minus infinity. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
818 if (0 < -1 % 10 && d < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
819 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
820 t++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
821 d += 10; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
822 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
823 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
824 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
825 *--bufp = d + '0'; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
826 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
827 while (t != 0); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
828 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
829 digits = 1; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
830 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
|
831 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
832 |
| 604 | 833 case 'X': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
834 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
835 goto bad_format; |
| 604 | 836 #ifdef _NL_CURRENT |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
837 if (! (modifier == 'E' |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
838 && *(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
|
839 subfmt = _NL_CURRENT (LC_TIME, T_FMT); |
| 604 | 840 goto subformat; |
| 841 #endif | |
| 842 /* Fall through. */ | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
843 case 'T': /* POSIX.2 extension. */ |
| 604 | 844 subfmt = "%H:%M:%S"; |
| 845 goto subformat; | |
| 846 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
847 case 't': /* POSIX.2 extension. */ |
| 604 | 848 add (1, *p = '\t'); |
| 849 break; | |
| 850 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
851 case 'u': /* POSIX.2 extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
852 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
|
853 |
| 604 | 854 case 'U': |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
855 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
856 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
857 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
858 DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); |
| 604 | 859 |
| 860 case 'V': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
861 case 'g': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
862 case 'G': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
863 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
864 goto bad_format; |
|
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 int year = tp->tm_year + TM_YEAR_BASE; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
867 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
|
868 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
869 if (days < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
870 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
871 /* This ISO week belongs to the previous year. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
872 year--; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
873 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
|
874 tp->tm_wday); |
|
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 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
877 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
878 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
|
879 tp->tm_wday); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
880 if (0 <= d) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
881 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
882 /* This ISO week belongs to the next year. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
883 year++; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
884 days = d; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
885 } |
|
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 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
888 switch (*f) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
889 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
890 case 'g': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
891 DO_NUMBER (2, (year % 100 + 100) % 100); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
892 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
893 case 'G': |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
894 DO_NUMBER (1, year); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
895 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
896 default: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
897 DO_NUMBER (2, days / 7 + 1); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
898 } |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
899 } |
| 604 | 900 |
| 901 case 'W': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
902 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
903 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
904 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
905 DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); |
| 604 | 906 |
| 907 case 'w': | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
908 if (modifier == 'E') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
909 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
910 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
911 DO_NUMBER (1, tp->tm_wday); |
| 604 | 912 |
| 913 case 'Y': | |
| 794 | 914 #if HAVE_STRUCT_ERA_ENTRY |
| 915 if (modifier == 'E') | |
| 916 { | |
| 917 struct era_entry *era = _nl_get_era_entry (tp); | |
| 918 if (era) | |
| 919 { | |
| 920 subfmt = strchr (era->name_fmt, '\0') + 1; | |
| 921 goto subformat; | |
| 922 } | |
| 923 } | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
924 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
925 if (modifier == 'O') |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
926 goto bad_format; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
927 else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
928 DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); |
| 604 | 929 |
| 930 case 'y': | |
| 794 | 931 #if HAVE_STRUCT_ERA_ENTRY |
| 932 if (modifier == 'E') | |
| 933 { | |
| 934 struct era_entry *era = _nl_get_era_entry (tp); | |
| 935 if (era) | |
| 936 { | |
| 937 int delta = tp->tm_year - era->start_date[0]; | |
| 938 DO_NUMBER (1, (era->offset | |
| 939 + (era->direction == '-' ? -delta : delta))); | |
| 940 } | |
| 941 } | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
942 #endif |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
943 DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100); |
| 604 | 944 |
| 945 case 'Z': | |
| 804 | 946 cpy (zonelen, zone); |
| 604 | 947 break; |
| 948 | |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
949 case 'z': /* GNU extension. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
950 if (tp->tm_isdst < 0) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
951 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
952 |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
953 { |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
954 int diff; |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
955 #if HAVE_TM_GMTOFF |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
956 diff = tp->tm_gmtoff; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
957 #else |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
958 struct tm gtm; |
|
726
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
959 struct tm ltm; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
960 time_t lt; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
961 |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
962 ltm = *tp; |
|
8867c987f8cf
(strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents:
691
diff
changeset
|
963 lt = mktime (<m); |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
964 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
965 if (lt == (time_t) -1) |
| 687 | 966 { |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
967 /* 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
|
968 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
|
969 occurred. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
970 struct tm tm; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
971 localtime_r (<, &tm); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
972 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
973 if ((ltm.tm_sec ^ tm.tm_sec) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
974 | (ltm.tm_min ^ tm.tm_min) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
975 | (ltm.tm_hour ^ tm.tm_hour) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
976 | (ltm.tm_mday ^ tm.tm_mday) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
977 | (ltm.tm_mon ^ tm.tm_mon) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
978 | (ltm.tm_year ^ tm.tm_year)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
979 break; |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
980 } |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
981 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
982 if (! gmtime_r (<, >m)) |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
983 break; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
984 |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
985 diff = tm_diff (<m, >m); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
986 #endif |
|
672
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
987 |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
988 if (diff < 0) |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
989 { |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
990 add (1, *p = '-'); |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
991 diff = -diff; |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
992 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
993 else |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
994 add (1, *p = '+'); |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
995 |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
996 diff /= 60; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
997 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
|
998 } |
|
d4a380613840
Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents:
668
diff
changeset
|
999 |
| 794 | 1000 case '\0': /* GNU extension: % at end of format. */ |
| 1001 --f; | |
| 1002 /* Fall through. */ | |
| 604 | 1003 default: |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1004 /* Unknown format; output the format, including the '%', |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1005 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
|
1006 multibyte string has been misparsed. */ |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1007 bad_format: |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1008 { |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1009 int flen; |
| 794 | 1010 for (flen = 1; f[1 - flen] != '%'; flen++) |
|
691
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1011 continue; |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1012 cpy (flen, &f[1 - flen]); |
|
6813ffe12e6a
(strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents:
687
diff
changeset
|
1013 } |
| 604 | 1014 break; |
| 9 | 1015 } |
| 1016 } | |
| 604 | 1017 |
| 1018 if (p) | |
| 1019 *p = '\0'; | |
| 1020 return i; | |
| 9 | 1021 } |