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