Pgindent timezone file, per request from Tom.

1 files changed, 370 insertions, 359 deletions

diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index 315a018b976..9a64df1f1d3 100644
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -25,22 +25,23 @@
 #include "tzfile.h"
 
 
-struct lc_time_T {
-	const char *	mon[MONSPERYEAR];
-	const char *	month[MONSPERYEAR];
-	const char *	wday[DAYSPERWEEK];
-	const char *	weekday[DAYSPERWEEK];
-	const char *	X_fmt;
-	const char *	x_fmt;
-	const char *	c_fmt;
-	const char *	am;
-	const char *	pm;
-	const char *	date_fmt;
+struct lc_time_T
+{
+	const char *mon[MONSPERYEAR];
+	const char *month[MONSPERYEAR];
+	const char *wday[DAYSPERWEEK];
+	const char *weekday[DAYSPERWEEK];
+	const char *X_fmt;
+	const char *x_fmt;
+	const char *c_fmt;
+	const char *am;
+	const char *pm;
+	const char *date_fmt;
 };
 
 #define Locale	(&C_time_locale)
 
-static const struct lc_time_T	C_time_locale = {
+static const struct lc_time_T C_time_locale = {
 	{
 		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
@@ -59,21 +60,16 @@ static const struct lc_time_T	C_time_locale = {
 	"%H:%M:%S",
 
 	/*
-	** x_fmt
-	** C99 requires this format.
-	** Using just numbers (as here) makes Quakers happier;
-	** it's also compatible with SVR4.
-	*/
+	 * * x_fmt * C99 requires this format. * Using just numbers (as here)
+	 * makes Quakers happier; * it's also compatible with SVR4.
+	 */
 	"%m/%d/%y",
 
 	/*
-	** c_fmt
-	** C99 requires this format.
-	** Previously this code used "%D %X", but we now conform to C99.
-	** Note that
-	**      "%a %b %d %H:%M:%S %Y"
-	** is used by Solaris 2.3.
-	*/
+	 * * c_fmt * C99 requires this format. * Previously this code used "%D
+	 * %X", but we now conform to C99. * Note that *      "%a %b %d
+	 * %H:%M:%S %Y" * is used by Solaris 2.3.
+	 */
 	"%a %b %e %T %Y",
 
 	/* am */
@@ -86,20 +82,21 @@ static const struct lc_time_T	C_time_locale = {
 	"%a %b %e %H:%M:%S %Z %Y"
 };
 
-static char * _add (const char *, char *, const char *);
-static char * _conv (int, const char *, char *, const char *);
-static char * _fmt (const char *, const struct pg_tm *, char *, const char *, int *);
+static char *_add(const char *, char *, const char *);
+static char *_conv(int, const char *, char *, const char *);
+static char *_fmt(const char *, const struct pg_tm *, char *, const char *, int *);
 
-#define IN_NONE	0
-#define IN_SOME	1
-#define IN_THIS	2
+#define IN_NONE 0
+#define IN_SOME 1
+#define IN_THIS 2
 #define IN_ALL	3
 
 
-size_t pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_tm *t)
+size_t
+pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_tm * t)
 {
-	char *	p;
-	int	warn;
+	char	   *p;
+	int			warn;
 
 	warn = IN_NONE;
 	p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
@@ -109,196 +106,196 @@ size_t pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_
 	return p - s;
 }
 
-static char * _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim, int *warnp)
+static char *
+_fmt(const char *format, const struct pg_tm * t, char *pt, const char *ptlim, int *warnp)
 {
-	for ( ; *format; ++format) {
-		if (*format == '%') {
-label:
-			switch (*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : Locale->weekday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'a':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : Locale->wday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'B':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : Locale->month[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'b':
-			case 'h':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : Locale->mon[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'C':
-				/*
-				** %C used to do a...
-				**	_fmt("%a %b %e %X %Y", t);
-				** ...whereas now POSIX 1003.2 calls for
-				** something completely different.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
-					"%02d", pt, ptlim);
-				continue;
-			case 'c':
-				{
-				int warn2 = IN_SOME;
-
-				pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'D':
-				pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
-				continue;
-			case 'd':
-				pt = _conv(t->tm_mday, "%02d", pt, ptlim);
-				continue;
-			case 'E':
-			case 'O':
-				/*
-				** C99 locale modifiers.
-				** The sequences
-				**	%Ec %EC %Ex %EX %Ey %EY
-				**	%Od %oe %OH %OI %Om %OM
-				**	%OS %Ou %OU %OV %Ow %OW %Oy
-				** are supposed to provide alternate
-				** representations.
-				*/
-				goto label;
-			case 'e':
-				pt = _conv(t->tm_mday, "%2d", pt, ptlim);
-				continue;
-			case 'F':
-				pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
-				continue;
-			case 'H':
-				pt = _conv(t->tm_hour, "%02d", pt, ptlim);
-				continue;
-			case 'I':
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%02d", pt, ptlim);
-				continue;
-			case 'j':
-				pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
-				continue;
-			case 'k':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour % 12 ?
-				**		t->tm_hour % 12 : 12, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbins'
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv(t->tm_hour, "%2d", pt, ptlim);
-				continue;
+	for (; *format; ++format)
+	{
+		if (*format == '%')
+		{
+	label:
+			switch (*++format)
+			{
+				case '\0':
+					--format;
+					break;
+				case 'A':
+					pt = _add((t->tm_wday < 0 ||
+							   t->tm_wday >= DAYSPERWEEK) ?
+							  "?" : Locale->weekday[t->tm_wday],
+							  pt, ptlim);
+					continue;
+				case 'a':
+					pt = _add((t->tm_wday < 0 ||
+							   t->tm_wday >= DAYSPERWEEK) ?
+							  "?" : Locale->wday[t->tm_wday],
+							  pt, ptlim);
+					continue;
+				case 'B':
+					pt = _add((t->tm_mon < 0 ||
+							   t->tm_mon >= MONSPERYEAR) ?
+							  "?" : Locale->month[t->tm_mon],
+							  pt, ptlim);
+					continue;
+				case 'b':
+				case 'h':
+					pt = _add((t->tm_mon < 0 ||
+							   t->tm_mon >= MONSPERYEAR) ?
+							  "?" : Locale->mon[t->tm_mon],
+							  pt, ptlim);
+					continue;
+				case 'C':
+
+					/*
+					 * * %C used to do a... *  _fmt("%a %b %e %X %Y", t); *
+					 * ...whereas now POSIX 1003.2 calls for * something
+					 * completely different. * (ado, 1993-05-24)
+					 */
+					pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
+							   "%02d", pt, ptlim);
+					continue;
+				case 'c':
+					{
+						int			warn2 = IN_SOME;
+
+						pt = _fmt(Locale->c_fmt, t, pt, ptlim, warnp);
+						if (warn2 == IN_ALL)
+							warn2 = IN_THIS;
+						if (warn2 > *warnp)
+							*warnp = warn2;
+					}
+					continue;
+				case 'D':
+					pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
+					continue;
+				case 'd':
+					pt = _conv(t->tm_mday, "%02d", pt, ptlim);
+					continue;
+				case 'E':
+				case 'O':
+
+					/*
+					 * * C99 locale modifiers. * The sequences *  %Ec %EC
+					 * %Ex %EX %Ey %EY *  %Od %oe %OH %OI %Om %OM *  %OS
+					 * %Ou %OU %OV %Ow %OW %Oy * are supposed to provide
+					 * alternate * representations.
+					 */
+					goto label;
+				case 'e':
+					pt = _conv(t->tm_mday, "%2d", pt, ptlim);
+					continue;
+				case 'F':
+					pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
+					continue;
+				case 'H':
+					pt = _conv(t->tm_hour, "%02d", pt, ptlim);
+					continue;
+				case 'I':
+					pt = _conv((t->tm_hour % 12) ?
+							   (t->tm_hour % 12) : 12,
+							   "%02d", pt, ptlim);
+					continue;
+				case 'j':
+					pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
+					continue;
+				case 'k':
+
+					/*
+					 * * This used to be... *  _conv(t->tm_hour % 12 ? *
+					 * t->tm_hour % 12 : 12, 2, ' '); * ...and has been
+					 * changed to the below to * match SunOS 4.1.1 and
+					 * Arnold Robbins' * strftime version 3.0.  That is,
+					 * "%k" and * "%l" have been swapped. * (ado,
+					 * 1993-05-24)
+					 */
+					pt = _conv(t->tm_hour, "%2d", pt, ptlim);
+					continue;
 #ifdef KITCHEN_SINK
-			case 'K':
-				/*
-				** After all this time, still unclaimed!
-				*/
-				pt = _add("kitchen sink", pt, ptlim);
-				continue;
-#endif /* defined KITCHEN_SINK */
-			case 'l':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbin's
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					"%2d", pt, ptlim);
-				continue;
-			case 'M':
-				pt = _conv(t->tm_min, "%02d", pt, ptlim);
-				continue;
-			case 'm':
-				pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
-				continue;
-			case 'n':
-				pt = _add("\n", pt, ptlim);
-				continue;
-			case 'p':
-				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					Locale->pm :
-					Locale->am,
-					pt, ptlim);
-				continue;
-			case 'R':
-				pt = _fmt("%H:%M", t, pt, ptlim, warnp);
-				continue;
-			case 'r':
-				pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp);
-				continue;
-			case 'S':
-				pt = _conv(t->tm_sec, "%02d", pt, ptlim);
-				continue;
-			case 's':
-				{
-					struct pg_tm	tm;
-					char		buf[INT_STRLEN_MAXIMUM(time_t) + 1];
-					time_t		mkt;
-
-					tm = *t;
-					mkt = pg_mktime(&tm);
-					if (TYPE_SIGNED(time_t))
-						(void) sprintf(buf, "%ld", (long) mkt);
-					else
-						(void) sprintf(buf, "%lu", (unsigned long) mkt);
-					pt = _add(buf, pt, ptlim);
-				}
-				continue;
-			case 'T':
-				pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
-				continue;
-			case 't':
-				pt = _add("\t", pt, ptlim);
-				continue;
-			case 'U':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					t->tm_wday) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'u':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "ISO 8601: Weekday as a decimal number
-				** [1 (Monday) - 7]"
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_wday == 0) ?
-					DAYSPERWEEK : t->tm_wday,
-					"%d", pt, ptlim);
-				continue;
-			case 'V':	/* ISO 8601 week number */
-			case 'G':	/* ISO 8601 year (four digits) */
-			case 'g':	/* ISO 8601 year (two digits) */
+				case 'K':
+
+					/*
+					 * * After all this time, still unclaimed!
+					 */
+					pt = _add("kitchen sink", pt, ptlim);
+					continue;
+#endif   /* defined KITCHEN_SINK */
+				case 'l':
+
+					/*
+					 * * This used to be... *  _conv(t->tm_hour, 2, ' '); *
+					 * ...and has been changed to the below to * match
+					 * SunOS 4.1.1 and Arnold Robbin's * strftime version
+					 * 3.0.  That is, "%k" and * "%l" have been swapped. *
+					 * (ado, 1993-05-24)
+					 */
+					pt = _conv((t->tm_hour % 12) ?
+							   (t->tm_hour % 12) : 12,
+							   "%2d", pt, ptlim);
+					continue;
+				case 'M':
+					pt = _conv(t->tm_min, "%02d", pt, ptlim);
+					continue;
+				case 'm':
+					pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
+					continue;
+				case 'n':
+					pt = _add("\n", pt, ptlim);
+					continue;
+				case 'p':
+					pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
+							  Locale->pm :
+							  Locale->am,
+							  pt, ptlim);
+					continue;
+				case 'R':
+					pt = _fmt("%H:%M", t, pt, ptlim, warnp);
+					continue;
+				case 'r':
+					pt = _fmt("%I:%M:%S %p", t, pt, ptlim, warnp);
+					continue;
+				case 'S':
+					pt = _conv(t->tm_sec, "%02d", pt, ptlim);
+					continue;
+				case 's':
+					{
+						struct pg_tm tm;
+						char		buf[INT_STRLEN_MAXIMUM(time_t) +1];
+						time_t		mkt;
+
+						tm = *t;
+						mkt = pg_mktime(&tm);
+						if (TYPE_SIGNED(time_t))
+							(void) sprintf(buf, "%ld", (long) mkt);
+						else
+							(void) sprintf(buf, "%lu", (unsigned long) mkt);
+						pt = _add(buf, pt, ptlim);
+					}
+					continue;
+				case 'T':
+					pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
+					continue;
+				case 't':
+					pt = _add("\t", pt, ptlim);
+					continue;
+				case 'U':
+					pt = _conv((t->tm_yday + DAYSPERWEEK -
+								t->tm_wday) / DAYSPERWEEK,
+							   "%02d", pt, ptlim);
+					continue;
+				case 'u':
+
+					/*
+					 * * From Arnold Robbins' strftime version 3.0: * "ISO
+					 * 8601: Weekday as a decimal number * [1 (Monday) -
+					 * 7]" * (ado, 1993-05-24)
+					 */
+					pt = _conv((t->tm_wday == 0) ?
+							   DAYSPERWEEK : t->tm_wday,
+							   "%d", pt, ptlim);
+					continue;
+				case 'V':		/* ISO 8601 week number */
+				case 'G':		/* ISO 8601 year (four digits) */
+				case 'g':		/* ISO 8601 year (two digits) */
 /*
 ** From Arnold Robbins' strftime version 3.0:  "the week number of the
 ** year (the first Monday as the first day of week 1) as a decimal number
@@ -317,144 +314,156 @@ label:
 ** 1997 lasts from 1996-12-30 to 1997-01-05..."
 ** (ado, 1996-01-02)
 */
-				{
-					int	year;
-					int	yday;
-					int	wday;
-					int	w;
-
-					year = t->tm_year + TM_YEAR_BASE;
-					yday = t->tm_yday;
-					wday = t->tm_wday;
-					for ( ; ; ) {
-						int	len;
-						int	bot;
-						int	top;
-
-						len = isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-						/*
-						** What yday (-3 ... 3) does
-						** the ISO year begin on?
-						*/
-						bot = ((yday + 11 - wday) %
-							DAYSPERWEEK) - 3;
-						/*
-						** What yday does the NEXT
-						** ISO year begin on?
-						*/
-						top = bot -
-							(len % DAYSPERWEEK);
-						if (top < -3)
-							top += DAYSPERWEEK;
-						top += len;
-						if (yday >= top) {
-							++year;
-							w = 1;
-							break;
+					{
+						int			year;
+						int			yday;
+						int			wday;
+						int			w;
+
+						year = t->tm_year + TM_YEAR_BASE;
+						yday = t->tm_yday;
+						wday = t->tm_wday;
+						for (;;)
+						{
+							int			len;
+							int			bot;
+							int			top;
+
+							len = isleap(year) ?
+								DAYSPERLYEAR :
+								DAYSPERNYEAR;
+
+							/*
+							 * * What yday (-3 ... 3) does * the ISO year
+							 * begin on?
+							 */
+							bot = ((yday + 11 - wday) %
+								   DAYSPERWEEK) - 3;
+
+							/*
+							 * * What yday does the NEXT * ISO year begin
+							 * on?
+							 */
+							top = bot -
+								(len % DAYSPERWEEK);
+							if (top < -3)
+								top += DAYSPERWEEK;
+							top += len;
+							if (yday >= top)
+							{
+								++year;
+								w = 1;
+								break;
+							}
+							if (yday >= bot)
+							{
+								w = 1 + ((yday - bot) /
+										 DAYSPERWEEK);
+								break;
+							}
+							--year;
+							yday += isleap(year) ?
+								DAYSPERLYEAR :
+								DAYSPERNYEAR;
 						}
-						if (yday >= bot) {
-							w = 1 + ((yday - bot) /
-								DAYSPERWEEK);
-							break;
+						if (*format == 'V')
+							pt = _conv(w, "%02d",
+									   pt, ptlim);
+						else if (*format == 'g')
+						{
+							*warnp = IN_ALL;
+							pt = _conv(year % 100, "%02d",
+									   pt, ptlim);
 						}
-						--year;
-						yday += isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
+						else
+							pt = _conv(year, "%04d",
+									   pt, ptlim);
 					}
-					if (*format == 'V')
-						pt = _conv(w, "%02d",
-							pt, ptlim);
-					else if (*format == 'g') {
-						*warnp = IN_ALL;
-						pt = _conv(year % 100, "%02d",
-							pt, ptlim);
-					} else	pt = _conv(year, "%04d",
-							pt, ptlim);
-				}
-				continue;
-			case 'v':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "date as dd-bbb-YYYY"
-				** (ado, 1993-05-24)
-				*/
-				pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
-				continue;
-			case 'W':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					(t->tm_wday ?
-					(t->tm_wday - 1) :
-					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					"%02d", pt, ptlim);
-				continue;
-			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim);
-				continue;
-			case 'X':
-				pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp);
-				continue;
-			case 'x':
-				{
-				int	warn2 = IN_SOME;
-
-				pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'y':
-				*warnp = IN_ALL;
-				pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
-					"%02d", pt, ptlim);
-				continue;
-			case 'Y':
-				pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
-					pt, ptlim);
-				continue;
-			case 'Z':
-				if (t->tm_zone != NULL)
-					pt = _add(t->tm_zone, pt, ptlim);
-				/*
-				** C99 says that %Z must be replaced by the
-				** empty string if the time zone is not
-				** determinable.
-				*/
-				continue;
-			case 'z':
-				{
-				int		diff;
-				char const *	sign;
-
-				if (t->tm_isdst < 0)
-					continue;
-				diff = t->tm_gmtoff;
-				if (diff < 0) {
-					sign = "-";
-					diff = -diff;
-				} else	sign = "+";
-				pt = _add(sign, pt, ptlim);
-				diff /= 60;
-				pt = _conv((diff/60)*100 + diff%60,
-					"%04d", pt, ptlim);
-				}
-				continue;
-			case '+':
-				pt = _fmt(Locale->date_fmt, t, pt, ptlim,
-					warnp);
-				continue;
-			case '%':
-			/*
-			** X311J/88-090 (4.12.3.5): if conversion char is
-			** undefined, behavior is undefined.  Print out the
-			** character itself as printf(3) also does.
-			*/
-			default:
-				break;
+					continue;
+				case 'v':
+
+					/*
+					 * * From Arnold Robbins' strftime version 3.0: *
+					 * "date as dd-bbb-YYYY" * (ado, 1993-05-24)
+					 */
+					pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
+					continue;
+				case 'W':
+					pt = _conv((t->tm_yday + DAYSPERWEEK -
+								(t->tm_wday ?
+								 (t->tm_wday - 1) :
+								 (DAYSPERWEEK - 1))) / DAYSPERWEEK,
+							   "%02d", pt, ptlim);
+					continue;
+				case 'w':
+					pt = _conv(t->tm_wday, "%d", pt, ptlim);
+					continue;
+				case 'X':
+					pt = _fmt(Locale->X_fmt, t, pt, ptlim, warnp);
+					continue;
+				case 'x':
+					{
+						int			warn2 = IN_SOME;
+
+						pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2);
+						if (warn2 == IN_ALL)
+							warn2 = IN_THIS;
+						if (warn2 > *warnp)
+							*warnp = warn2;
+					}
+					continue;
+				case 'y':
+					*warnp = IN_ALL;
+					pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
+							   "%02d", pt, ptlim);
+					continue;
+				case 'Y':
+					pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
+							   pt, ptlim);
+					continue;
+				case 'Z':
+					if (t->tm_zone != NULL)
+						pt = _add(t->tm_zone, pt, ptlim);
+
+					/*
+					 * * C99 says that %Z must be replaced by the * empty
+					 * string if the time zone is not * determinable.
+					 */
+					continue;
+				case 'z':
+					{
+						int			diff;
+						char const *sign;
+
+						if (t->tm_isdst < 0)
+							continue;
+						diff = t->tm_gmtoff;
+						if (diff < 0)
+						{
+							sign = "-";
+							diff = -diff;
+						}
+						else
+							sign = "+";
+						pt = _add(sign, pt, ptlim);
+						diff /= 60;
+						pt = _conv((diff / 60) * 100 + diff % 60,
+								   "%04d", pt, ptlim);
+					}
+					continue;
+				case '+':
+					pt = _fmt(Locale->date_fmt, t, pt, ptlim,
+							  warnp);
+					continue;
+				case '%':
+
+					/*
+					 * * X311J/88-090 (4.12.3.5): if conversion char is *
+					 * undefined, behavior is undefined.  Print out the *
+					 * character itself as printf(3) also does.
+					 */
+				default:
+					break;
 			}
 		}
 		if (pt == ptlim)
@@ -464,15 +473,17 @@ label:
 	return pt;
 }
 
-static char * _conv(const int n, const char *format, char *pt, const char *ptlim)
+static char *
+_conv(const int n, const char *format, char *pt, const char *ptlim)
 {
-	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
+	char		buf[INT_STRLEN_MAXIMUM(int) +1];
 
 	(void) sprintf(buf, format, n);
 	return _add(buf, pt, ptlim);
 }
 
-static char *_add(const char *str, char *pt, const char *ptlim)
+static char *
+_add(const char *str, char *pt, const char *ptlim)
 {
 	while (pt < ptlim && (*pt = *str++) != '\0')
 		++pt;