Mercurial > hg > octave-shane > gnulib-hg

annotate lib/strftime.c @ 726:8867c987f8cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(strftime): Accommodate the broken C compiler that comes with SunOS -- don't initialize aggregates in decls of automatic variables. Reported by Kaveh Ghazi.
author Jim Meyering <jim@meyering.net>
date Thu, 10 Oct 1996 02:56:10 +0000
parents 6813ffe12e6a
children 70c419102365
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
1 /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
2 This file is part of the GNU C Library.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
3
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
4 The GNU C Library is free software; you can redistribute it and/or
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
5 modify it under the terms of the GNU Library General Public License as
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
6 published by the Free Software Foundation; either version 2 of the
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
7 License, or (at your option) any later version.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
8
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
9 The GNU C Library is distributed in the hope that it will be useful,
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
12 Library General Public License for more details.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
14 You should have received a copy of the GNU Library General Public
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
15 License along with the GNU C Library; see the file COPYING.LIB. If
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
16 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
17 Cambridge, MA 02139, USA. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18
125
539738c0b6c2 merge with 1.8.1d
Jim Meyering <jim@meyering.net>
parents: 101
diff changeset
19 #ifdef HAVE_CONFIG_H
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
20 # include <config.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
21 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
22
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
23 #ifdef _LIBC
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
24 # define HAVE_LIMITS_H 1
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
25 # define HAVE_MBLEN 1
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
26 # define HAVE_MBRLEN 1
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
27 # define HAVE_TM_GMTOFF 1
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
28 # define HAVE_TM_ZONE 1
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
29 # define MULTIBYTE_IS_FORMAT_SAFE 1
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
30 # define STDC_HEADERS 1
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
31 # include <ansidecl.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
32 # include "../locale/localeinfo.h"
125
539738c0b6c2 merge with 1.8.1d
Jim Meyering <jim@meyering.net>
parents: 101
diff changeset
33 #endif
539738c0b6c2 merge with 1.8.1d
Jim Meyering <jim@meyering.net>
parents: 101
diff changeset
34
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
35 #include <sys/types.h> /* Some systems define `time_t' here. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
36
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
37 #ifdef TIME_WITH_SYS_TIME
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
38 # include <sys/time.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
39 # include <time.h>
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
40 #else
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
41 # ifdef HAVE_SYS_TIME_H
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
42 # include <sys/time.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
43 # else
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
44 # include <time.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
45 # endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
46 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
47
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
48 /* Do multibyte processing if multibytes are supported, unless
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
49 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
50 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
51 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
52 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
53 with other C libraries that use unsafe encodings. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
54 #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
55
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
56 #if DO_MULTIBYTE
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
57 # if HAVE_MBRLEN
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
58 # include <wchar.h>
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
59 # else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
60 /* Simulate mbrlen with mblen as best we can. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
61 # define mbstate_t int
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
62 # define mbrlen(s, n, ps) mblen (s, n)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
63 # define mbsinit(ps) (*(ps) == 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
64 # endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
65 static const mbstate_t mbstate_zero;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
66 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
67
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
68 #if HAVE_LIMITS_H
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
69 # include <limits.h>
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
70 #endif
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
71
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
72 #if STDC_HEADERS
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
73 # include <stddef.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
74 # include <stdlib.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
75 # include <string.h>
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
76 #else
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
77 # define memcpy(d, s, n) bcopy (s, d, n)
176
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
78 #endif
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
79
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
80 #ifndef __P
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
81 #if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
82 #define __P(args) args
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
83 #else
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
84 #define __P(args) ()
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
85 #endif /* GCC. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
86 #endif /* Not __P. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
87
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
88 #ifndef PTR
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
89 #ifdef __STDC__
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
90 #define PTR void *
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
91 #else
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
92 #define PTR char *
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
93 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
94 #endif
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
95
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
96 #ifndef CHAR_BIT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
97 #define CHAR_BIT 8
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
98 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
99
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
100 #define TYPE_SIGNED(t) ((t) -1 < 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
101
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
102 /* 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
103 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
104 302 / 1000 is log10 (2) rounded up;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
105 add one for integer division truncation;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
106 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
107 #define INT_STRLEN_BOUND(t) \
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
108 ((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
109
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
110 #define TM_YEAR_BASE 1900
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
111
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
112 #ifndef __isleap
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
113 /* 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
114 except every 100th isn't, and every 400th is). */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
115 #define __isleap(year) \
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
116 ((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
117 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
118
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
119
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
120 #ifdef _LIBC
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
121 # define gmtime_r __gmtime_r
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
122 # define localtime_r __localtime_r
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
123 #else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
124 # if ! HAVE_LOCALTIME_R
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
125 # if ! HAVE_TM_GMTOFF
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
126 /* Approximate gmtime_r as best we can in its absence. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
127 #define gmtime_r my_gmtime_r
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
128 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
129 static struct tm *
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
130 gmtime_r (t, tp)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
131 const time_t *t;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
132 struct tm *tp;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
133 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
134 struct tm *l = gmtime (t);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
135 if (! l)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
136 return 0;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
137 *tp = *l;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
138 return tp;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
139 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
140 # endif /* ! HAVE_TM_GMTOFF */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
141
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
142 /* Approximate localtime_r as best we can in its absence. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
143 #define localtime_r my_localtime_r
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
144 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
145 static struct tm *
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
146 localtime_r (t, tp)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
147 const time_t *t;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
148 struct tm *tp;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
149 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
150 struct tm *l = localtime (t);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
151 if (! l)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
152 return 0;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
153 *tp = *l;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
154 return tp;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
155 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
156 # endif /* ! HAVE_LOCALTIME_R */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
157 #endif /* ! defined (_LIBC) */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
158
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
159
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
160 #define add(n, f) \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
161 do \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
162 { \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
163 i += (n); \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
164 if (i >= maxsize) \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
165 return 0; \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
166 else \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
167 if (p) \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
168 { \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
169 f; \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
170 p += (n); \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
171 } \
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
172 } while (0)
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
173 #define cpy(n, s) add ((n), memcpy((PTR) p, (PTR) (s), (n)))
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
174
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
175 #if ! HAVE_TM_GMTOFF
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
176 /* Yield the difference between *A and *B,
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
177 measured in seconds, ignoring leap seconds. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
178 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
179 static int
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
180 tm_diff (a, b)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
181 const struct tm *a;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
182 const struct tm *b;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
183 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
184 int ay = a->tm_year + TM_YEAR_BASE - 1;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
185 int by = b->tm_year + TM_YEAR_BASE - 1;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
186 /* Divide years by 100, rounding towards minus infinity. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
187 int ac = ay / 100 - (ay % 100 < 0);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
188 int bc = by / 100 - (by % 100 < 0);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
189 int intervening_leap_days =
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
190 ((ay >> 2) - (by >> 2)) - (ac - bc) + ((ac >> 2) - (bc >> 2));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
191 int years = ay - by;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
192 int days = (365 * years + intervening_leap_days
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
193 + (a->tm_yday - b->tm_yday));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
194 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
195 + (a->tm_min - b->tm_min))
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
196 + (a->tm_sec - b->tm_sec));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
197 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
198 #endif /* ! HAVE_TM_GMTOFF */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
199
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
200
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
201
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
202 /* 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
203 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
204 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
205 be as small as YDAY_MINIMUM. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
206 #define ISO_WEEK_START_WDAY 1 /* Monday */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
207 #define ISO_WEEK1_WDAY 4 /* Thursday */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
208 #define YDAY_MINIMUM (-366)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
209 static int iso_week_days __P ((int, int));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
210 #ifdef __GNUC__
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
211 inline
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
212 #endif
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
213 static int
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
214 iso_week_days (yday, wday)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
215 int yday;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
216 int wday;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
217 {
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
218 /* 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
219 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
220 return (yday
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
221 - (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
222 + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
223 }
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
224
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
225
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
226 #ifndef _NL_CURRENT
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
227 static char const weekday_name[][10] =
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
228 {
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
229 "Sunday", "Monday", "Tuesday", "Wednesday",
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
230 "Thursday", "Friday", "Saturday"
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
231 };
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
232 static char const month_name[][10] =
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
233 {
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
234 "January", "February", "March", "April", "May", "June",
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
235 "July", "August", "September", "October", "November", "December"
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
236 };
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
237 #endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
238
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
239 /* Write information from TP into S according to the format
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
240 string FORMAT, writing no more that MAXSIZE characters
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
241 (including the terminating '\0') and returning number of
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
242 characters written. If S is NULL, nothing will be written
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
243 anywhere, so to determine how many characters would be
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
244 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
245 size_t
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
246 strftime (s, maxsize, format, tp)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
247 char *s;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
248 size_t maxsize;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
249 const char *format;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
250 register const struct tm *tp;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
251 {
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
252 int hour12 = tp->tm_hour;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
253 #ifdef _NL_CURRENT
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
254 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
255 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
256 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
257 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
258 const char *const ampm = _NL_CURRENT (LC_TIME,
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
259 hour12 > 11 ? PM_STR : AM_STR);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
260 size_t aw_len = strlen(a_wkday);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
261 size_t am_len = strlen(a_month);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
262 size_t ap_len = strlen (ampm);
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
263
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
264 const char *alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
265 const char *end_alt_digits = _NL_CURRENT (LC_TIME, ALT_DIGITS + 1);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
266 #else
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
267 const char *const f_wkday = weekday_name[tp->tm_wday];
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
268 const char *const f_month = month_name[tp->tm_mon];
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
269 const char *const a_wkday = f_wkday;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
270 const char *const a_month = f_month;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
271 const char *const ampm = "AMPM" + 2 * (hour12 > 11);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
272 size_t aw_len = 3;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
273 size_t am_len = 3;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
274 size_t ap_len = 2;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
275 #endif
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
276 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
277 size_t month_len = strlen (f_month);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
278 const char *zone;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
279 size_t zonelen;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
280 register size_t i = 0;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
281 register char *p = s;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
282 register const char *f;
582
3ec26150a8d6 (mon_week_ISO): New function to implement new %V format.
Jim Meyering <jim@meyering.net>
parents: 581
diff changeset
283
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
284 zone = 0;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
285 #if HAVE_TM_ZONE
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
286 zone = (const char *) tp->tm_zone;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
287 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
288 #if HAVE_TZNAME
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
289 if (!(zone && *zone) && tp->tm_isdst >= 0)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
290 zone = tzname[tp->tm_isdst];
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
291 #endif
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
292 if (! zone)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
293 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
294
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
295 zonelen = strlen (zone);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
296
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
297 if (hour12 > 12)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
298 hour12 -= 12;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
299 else
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
300 if (hour12 == 0) hour12 = 12;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
301
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
302 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
303 {
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
304 int pad; /* Padding for number ('-', '_', or 0). */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
305 int modifier; /* Field modifier ('E', 'O', or 0). */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
306 int digits; /* Max digits for numeric format. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
307 int number_value; /* Numeric value to be printed. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
308 int negative_number; /* 1 if the number is negative. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
309 const char *subfmt;
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
310 char *bufp;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
311 char buf[1 + (sizeof (int) < sizeof (time_t)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
312 ? INT_STRLEN_BOUND (time_t)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
313 : INT_STRLEN_BOUND (int))];
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
314
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
315 #if DO_MULTIBYTE
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
316
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
317 switch (*f)
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
318 {
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
319 case '%':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
320 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
321
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
322 case '\a': case '\b': case '\t': case '\n':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
323 case '\v': case '\f': case '\r':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
324 case ' ': case '!': case '"': case '#': case '&': case'\'':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
325 case '(': case ')': case '*': case '+': case ',': case '-':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
326 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
327 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
328 case ':': case ';': case '<': case '=': case '>': case '?':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
329 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
330 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
331 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
332 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
333 case 'Y': case 'Z': case '[': case'\\': case ']': case '^':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
334 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
335 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
336 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
337 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
338 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
339 case '~':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
340 /* 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
341 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
342 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
343 not be analyzed further. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
344 add (1, *p = *f);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
345 continue;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
346
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
347 default:
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
348 /* 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
349 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
350 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
351 mbstate_t mbstate = mbstate_zero;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
352 size_t len = 0;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
353
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
354 do
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
355 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
356 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
357
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
358 if (bytes == 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
359 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
360
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
361 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
362 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
363 len++;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
364 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
365 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
366
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
367 len += bytes;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
368 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
369 while (! mbsinit (&mbstate));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
370
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
371 cpy (len, f);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
372 continue;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
373 }
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
374 }
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
375
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
376 #else /* ! DO_MULTIBYTE */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
377
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
378 /* 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
379 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
380 if (*f != '%')
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
381 {
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
382 add (1, *p = *f);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
383 continue;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
384 }
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
385
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
386 #endif /* ! DO_MULTIBYTE */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
387
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
388 /* Check for flags that can modify a number format. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
389 ++f;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
390 switch (*f)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
391 {
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
392 case '_':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
393 case '-':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
394 pad = *f++;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
395 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
396
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
397 default:
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
398 pad = 0;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
399 break;
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
400 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
401
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
402 /* Check for modifiers. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
403 switch (*f)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
404 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
405 case 'E':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
406 case 'O':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
407 modifier = *f++;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
408 break;
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
409
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
410 default:
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
411 modifier = 0;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
412 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
413 }
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
414
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
415 /* Now do the specified format. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
416 switch (*f)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
417 {
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
418 #define DO_NUMBER(d, v) \
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
419 digits = d; number_value = v; goto do_number
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
420 #define DO_NUMBER_SPACEPAD(d, v) \
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
421 digits = d; number_value = v; goto do_number_spacepad
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
422
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
423 case '\0': /* GNU extension: % at end of format. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
424 --f;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
425 /* Fall through. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
426 case '%':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
427 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
428 goto bad_format;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
429 add (1, *p = *f);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
430 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
431
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
432 case 'a':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
433 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
434 goto bad_format;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
435 cpy (aw_len, a_wkday);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
436 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
437
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
438 case 'A':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
439 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
440 goto bad_format;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
441 cpy (wkday_len, f_wkday);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
442 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
443
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
444 case 'b':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
445 case 'h': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
446 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
447 goto bad_format;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
448 cpy (am_len, a_month);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
449 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
450
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
451 case 'B':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
452 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
453 goto bad_format;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
454 cpy (month_len, f_month);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
455 break;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
456
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
457 case 'c':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
458 if (modifier == 'O')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
459 goto bad_format;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
460 #ifdef _NL_CURRENT
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
461 if (! (modifier == 'E'
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
462 && *(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
463 subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
464 #else
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
465 subfmt = "%a %b %e %H:%M:%S %Z %Y";
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
466 #endif
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
467
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
468 subformat:
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
469 {
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
470 size_t len = strftime (p, maxsize - i, subfmt, tp);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
471 if (len == 0 && *subfmt)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
472 return 0;
659
3573b0b5ed38 Use `;' instead of (void)0.
Jim Meyering <jim@meyering.net>
parents: 658
diff changeset
473 add (len, ;);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
474 }
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
475 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
476
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
477 case 'C': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
478 if (modifier == 'O')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
479 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
480 #ifdef _NL_CURRENT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
481 /* XXX %EC is not implemented yet. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
482 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
483 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
484 int year = tp->tm_year + TM_YEAR_BASE;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
485 DO_NUMBER (1, year / 100 - (year % 100 < 0));
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
486 }
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
487
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
488 case 'x':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
489 if (modifier == 'O')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
490 goto bad_format;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
491 #ifdef _NL_CURRENT
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
492 if (! (modifier == 'E'
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
493 && *(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
494 subfmt = _NL_CURRENT (LC_TIME, D_FMT);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
495 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
496 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
497 /* Fall through. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
498 case 'D': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
499 if (modifier != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
500 goto bad_format;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
501 subfmt = "%m/%d/%y";
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
502 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
503
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
504 case 'd':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
505 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
506 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
507
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
508 DO_NUMBER (2, tp->tm_mday);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
509
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
510 case 'e': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
511 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
512 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
513
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
514 DO_NUMBER_SPACEPAD (2, tp->tm_mday);
176
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
515
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
516 /* 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
517 jump to one of these two labels. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
518
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
519 do_number_spacepad:
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
520 /* Force `_' flag. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
521 pad = '_';
176
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
522
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
523 do_number:
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
524 /* Format the number according to the MODIFIER flag. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
525
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
526 #ifdef _NL_CURRENT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
527 if (modifier == 'O')
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 /* ALT_DIGITS is the first entry in an array with
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
530 alternative digit symbols. We have to find string
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
531 number NUMBER_VALUE, but must not look beyond
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
532 END_ALT_DIGITS. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
533 int run = number_value;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
534 const char *cp = alt_digits;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
535
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
536 while (run > 0 && cp < end_alt_digits)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
537 cp = strchr (cp, '\0') + 1;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
538
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
539 if (cp < end_alt_digits)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
540 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
541 size_t digitlen = strlen (cp);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
542 if (digitlen != 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
543 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
544 cpy (digitlen, cp);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
545 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
546 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
547 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
548 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
549 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
550 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
551 unsigned int u = number_value;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
552
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
553 bufp = buf + sizeof (buf);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
554 negative_number = number_value < 0;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
555
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
556 if (negative_number)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
557 u = -u;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
558
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
559 do
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
560 *--bufp = u % 10 + '0';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
561 while ((u /= 10) != 0);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
562 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
563
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
564 do_number_sign_and_padding:
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
565 if (negative_number)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
566 *--bufp = '-';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
567
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
568 if (pad != '-')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
569 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
570 int padding = digits - (buf + sizeof (buf) - bufp);
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
571
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
572 if (pad == '_')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
573 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
574 while (0 < padding--)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
575 *--bufp = ' ';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
576 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
577 else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
578 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
579 bufp += negative_number;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
580 while (0 < padding--)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
581 *--bufp = '0';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
582 if (negative_number)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
583 *--bufp = '-';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
584 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
585 }
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
586
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
587 cpy (buf + sizeof (buf) - bufp, bufp);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
588 break;
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
589
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
590
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
591 case 'H':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
592 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
593 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
594
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
595 DO_NUMBER (2, tp->tm_hour);
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
596
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
597 case 'I':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
598 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
599 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
600
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
601 DO_NUMBER (2, hour12);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
602
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
603 case 'k': /* GNU extension. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
604 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
605 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
606
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
607 DO_NUMBER_SPACEPAD (2, tp->tm_hour);
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
608
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
609 case 'l': /* GNU extension. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
610 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
611 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
612
657
603fe5f2b1d9 Update from FSF.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
613 DO_NUMBER_SPACEPAD (2, hour12);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
614
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
615 case 'j':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
616 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
617 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
618
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
619 DO_NUMBER (3, 1 + tp->tm_yday);
546
baaeb11e50e5 (add_num_tz): New function.
Jim Meyering <jim@meyering.net>
parents: 307
diff changeset
620
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
621 case 'M':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
622 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
623 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
624
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
625 DO_NUMBER (2, tp->tm_min);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
626
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
627 case 'm':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
628 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
629 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
630
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
631 DO_NUMBER (2, tp->tm_mon + 1);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
632
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
633 case 'n': /* POSIX.2 extension. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
634 add (1, *p = '\n');
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
635 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
636
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
637 case 'p':
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
638 cpy (ap_len, ampm);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
639 break;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
640
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
641 case 'R': /* GNU extension. */
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
642 subfmt = "%H:%M";
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
643 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
644
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
645 case 'r': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
646 #ifdef _NL_CURRENT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
647 subfmt = _NL_CURRENT (LC_TIME, T_FMT_AMPM);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
648 #else
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
649 subfmt = "%I:%M:%S %p";
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
650 #endif
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
651 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
652
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
653 case 'S':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
654 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
655 return 0;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
656
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
657 DO_NUMBER (2, tp->tm_sec);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
658
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
659 case 's': /* GNU extension. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
660 {
726
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
661 struct tm ltm;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
662 time_t t;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
663
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
664 ltm = *tp;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
665 t = mktime (&ltm);
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
666
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
667 /* 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
668 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
669
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
670 bufp = buf + sizeof (buf);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
671 negative_number = t < 0;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
672
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
673 do
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
674 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
675 int d = t % 10;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
676 t /= 10;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
677
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
678 if (negative_number)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
679 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
680 d = -d;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
681
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
682 /* Adjust if division truncates to minus infinity. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
683 if (0 < -1 % 10 && d < 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
684 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
685 t++;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
686 d += 10;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
687 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
688 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
689
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
690 *--bufp = d + '0';
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
691 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
692 while (t != 0);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
693
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
694 digits = 1;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
695 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
696 }
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
697
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
698 case 'X':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
699 if (modifier == 'O')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
700 goto bad_format;
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
701 #ifdef _NL_CURRENT
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
702 if (! (modifier == 'E'
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
703 && *(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
704 subfmt = _NL_CURRENT (LC_TIME, T_FMT);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
705 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
706 #endif
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
707 /* Fall through. */
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
708 case 'T': /* POSIX.2 extension. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
709 subfmt = "%H:%M:%S";
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
710 goto subformat;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
711
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
712 case 't': /* POSIX.2 extension. */
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
713 add (1, *p = '\t');
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
714 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
715
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
716 case 'u': /* POSIX.2 extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
717 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
718
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
719 case 'U':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
720 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
721 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
722
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
723 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
724
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
725 case 'V':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
726 case 'g': /* GNU extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
727 case 'G': /* GNU extension. */
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 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
731 int year = tp->tm_year + TM_YEAR_BASE;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
732 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
733
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
734 if (days < 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
735 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
736 /* This ISO week belongs to the previous year. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
737 year--;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
738 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
739 tp->tm_wday);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
740 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
741 else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
742 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
743 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
744 tp->tm_wday);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
745 if (0 <= d)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
746 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
747 /* This ISO week belongs to the next year. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
748 year++;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
749 days = d;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
750 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
751 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
752
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
753 switch (*f)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
754 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
755 case 'g':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
756 DO_NUMBER (2, (year % 100 + 100) % 100);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
757
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
758 case 'G':
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
759 DO_NUMBER (1, year);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
760
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
761 default:
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
762 DO_NUMBER (2, days / 7 + 1);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
763 }
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
764 }
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
765
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
766 case 'W':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
767 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
768 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
769
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
770 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
771
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
772 case 'w':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
773 if (modifier == 'E')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
774 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
775
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
776 DO_NUMBER (1, tp->tm_wday);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
777
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
778 case 'Y':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
779 #ifdef _NL_CURRENT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
780 if (modifier == 'E'
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
781 && *(subfmt = _NL_CURRENT (LC_TIME, ERA_YEAR)) != '\0')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
782 goto subformat;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
783 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
784 if (modifier == 'O')
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
785 goto bad_format;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
786 else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
787 DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
788
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
789 case 'y':
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
790 #ifdef _NL_CURRENT
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
791 /* XXX %Ey is not implemented yet. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
792 #endif
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
793 DO_NUMBER (2, (tp->tm_year % 100 + 100) % 100);
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
794
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
795 case 'Z':
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
796 cpy(zonelen, zone);
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
797 break;
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
798
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
799 case 'z': /* GNU extension. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
800 if (tp->tm_isdst < 0)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
801 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
802
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
803 {
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
804 int diff;
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
805 #if HAVE_TM_GMTOFF
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
806 diff = tp->tm_gmtoff;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
807 #else
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
808 struct tm gtm;
726
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
809 struct tm ltm;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
810 time_t lt;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
811
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
812 ltm = *tp;
8867c987f8cf (strftime): Accommodate the broken C compiler
Jim Meyering <jim@meyering.net>
parents: 691
diff changeset
813 lt = mktime (&ltm);
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
814
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
815 if (lt == (time_t) -1)
687
e46401d63db8 revert last change
Jim Meyering <jim@meyering.net>
parents: 686
diff changeset
816 {
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
817 /* 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
818 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
819 occurred. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
820 struct tm tm;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
821 localtime_r (&lt, &tm);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
822
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
823 if ((ltm.tm_sec ^ tm.tm_sec)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
824 | (ltm.tm_min ^ tm.tm_min)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
825 | (ltm.tm_hour ^ tm.tm_hour)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
826 | (ltm.tm_mday ^ tm.tm_mday)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
827 | (ltm.tm_mon ^ tm.tm_mon)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
828 | (ltm.tm_year ^ tm.tm_year))
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
829 break;
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
830 }
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
831
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
832 if (! gmtime_r (&lt, &gtm))
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
833 break;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
834
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
835 diff = tm_diff (&ltm, &gtm);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
836 #endif
672
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
837
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
838 if (diff < 0)
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
839 {
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
840 add (1, *p = '-');
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
841 diff = -diff;
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
842 }
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
843 else
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
844 add (1, *p = '+');
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
845
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
846 diff /= 60;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
847 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
848 }
d4a380613840 Update from GNU libc -- this adds back %z and %s
Jim Meyering <jim@meyering.net>
parents: 668
diff changeset
849
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
850 default:
691
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
851 /* Unknown format; output the format, including the '%',
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
852 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
853 multibyte string has been misparsed. */
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
854 bad_format:
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
855 {
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
856 int flen;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
857 for (flen = 2; f[1 - flen] != '%'; flen++)
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
858 continue;
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
859 cpy (flen, &f[1 - flen]);
6813ffe12e6a (strftime): New version, from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 687
diff changeset
860 }
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
861 break;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
862 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
863 }
604
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
864
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
865 if (p)
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
866 *p = '\0';
e54f6bf3d960 Update from GNU libc.
Jim Meyering <jim@meyering.net>
parents: 582
diff changeset
867 return i;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
868 }