octave-kai/gnulib-hg: lib/strftime.c annotate

annotate lib/strftime.c @ 803:ff62201579ac

revert last change.

author	Jim Meyering <jim@meyering.net>
date	Tue, 10 Dec 1996 03:16:36 +0000
parents	2b2773a0abe2
children	de3dd213676c

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

Mercurial > hg > octave-kai > gnulib-hg

annotate lib/strftime.c @ 803:ff62201579ac