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