annotate lib/strftime.c @ 1058:8c9ee29f3de0

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