about summary refs log tree commit diff
path: root/timezone/scheck.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-01-07 11:45:07 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-01-07 11:45:07 +0000
commit670a687dea6773147a227bebfa9d801dae739ee0 (patch)
tree380b348ef7d52bd144e78f4a661dda0b40e87477 /timezone/scheck.c
parent45c4f3665aaa63cab148cc9cc96fa07c666c1c38 (diff)
downloadglibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.gz
glibc-670a687dea6773147a227bebfa9d801dae739ee0.tar.xz
glibc-670a687dea6773147a227bebfa9d801dae739ee0.zip
Update timezone code from tzcode 2015g.
This patch updates the timezone code from tzcode 2015g.  The Makefile
and README changes are based on those in Paul's patch
<https://sourceware.org/ml/libc-alpha/2015-05/msg00553.html>.

Tested for x86_64 and x86.

2016-01-06  Paul Eggert  <eggert@cs.ucla.edu>
	    Joseph Myers  <joseph@codesourcery.com>

	* timezone/private.h: Update from tzcode 2015g.
	* timezone/tzfile.h: Likewise.
	* timezone/tzselect.ksh: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
	* timezone/ialloc.c: Remove file.
	* timezone/scheck.c: Likewise.
	* timezone/Makefile (extra-objs): Remove variable.
	($(objpfx)zic): Do not depend on scheck.o and ialloc.o.
	(tz-cflags): Add -DHAVE_GETTEXT -DUSE_LTZ=0
	-Wno-maybe-uninitialized.
	(CFLAGS-zdump.c): Remove -fwrapv -DNOID -DHAVE_GETTEXT.
	(CFLAGS-zic.c): Remove -DNOID -DHAVE_GETTEXT.
	(CFLAGS-ialloc.c): Remove variable.
	(CFLAGS-scheck.c): Likewise.
	* timezone/README: Update list of files from tzcode.
Diffstat (limited to 'timezone/scheck.c')
-rw-r--r--timezone/scheck.c64
1 files changed, 0 insertions, 64 deletions
diff --git a/timezone/scheck.c b/timezone/scheck.c
deleted file mode 100644
index 8bd01a858f..0000000000
--- a/timezone/scheck.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-** This file is in the public domain, so clarified as of
-** 2006-07-17 by Arthur David Olson.
-*/
-
-/*LINTLIBRARY*/
-
-#include "private.h"
-
-const char *
-scheck(const char *const string, const char *const format)
-{
-	register char *		fbuf;
-	register const char *	fp;
-	register char *		tp;
-	register int		c;
-	register const char *	result;
-	char			dummy;
-
-	result = "";
-	if (string == NULL || format == NULL)
-		return result;
-	fbuf = malloc(2 * strlen(format) + 4);
-	if (fbuf == NULL)
-		return result;
-	fp = format;
-	tp = fbuf;
-
-	/*
-	** Copy directives, suppressing each conversion that is not
-	** already suppressed.  Scansets containing '%' are not
-	** supported; e.g., the conversion specification "%[%]" is not
-	** supported.  Also, multibyte characters containing a
-	** non-leading '%' byte are not supported.
-	*/
-	while ((*tp++ = c = *fp++) != '\0') {
-		if (c != '%')
-			continue;
-		if (is_digit(*fp)) {
-			char const *f = fp;
-			char *t = tp;
-			do {
-				*t++ = c = *f++;
-			} while (is_digit(c));
-			if (c == '$') {
-				fp = f;
-				tp = t;
-			}
-		}
-		*tp++ = '*';
-		if (*fp == '*')
-			++fp;
-		if ((*tp++ = *fp++) == '\0')
-			break;
-	}
-
-	*(tp - 1) = '%';
-	*tp++ = 'c';
-	*tp = '\0';
-	if (sscanf(string, fbuf, &dummy) != 1)
-		result = format;
-	free(fbuf);
-	return result;
-}