Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src PR/29826: J. T. Conklin: Add wcsftime(3) (from FreeBSD)
details: https://anonhg.NetBSD.org/src/rev/19aeea191925
branches: trunk
changeset: 579873:19aeea191925
user: christos <christos%NetBSD.org@localhost>
date: Wed Mar 30 03:47:11 2005 +0000
description:
PR/29826: J. T. Conklin: Add wcsftime(3) (from FreeBSD)
diffstat:
include/wchar.h | 6 +-
lib/libc/locale/Makefile.inc | 4 +-
lib/libc/locale/wcsftime.c | 112 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 3 deletions(-)
diffs (161 lines):
diff -r c38d639ae661 -r 19aeea191925 include/wchar.h
--- a/include/wchar.h Wed Mar 30 01:33:30 2005 +0000
+++ b/include/wchar.h Wed Mar 30 03:47:11 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: wchar.h,v 1.21 2005/02/03 04:39:32 perry Exp $ */
+/* $NetBSD: wchar.h,v 1.22 2005/03/30 03:47:11 christos Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -93,6 +93,8 @@
#undef _BSD_SIZE_T_
#endif
+struct tm;
+
__BEGIN_DECLS
wint_t btowc(int);
size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
@@ -108,6 +110,8 @@
int wcscoll(const wchar_t *, const wchar_t *);
wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
size_t wcscspn(const wchar_t *, const wchar_t *);
+size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
+ const struct tm * __restrict);
size_t wcslen(const wchar_t *);
wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t);
int wcsncmp(const wchar_t *, const wchar_t *, size_t);
diff -r c38d639ae661 -r 19aeea191925 lib/libc/locale/Makefile.inc
--- a/lib/libc/locale/Makefile.inc Wed Mar 30 01:33:30 2005 +0000
+++ b/lib/libc/locale/Makefile.inc Wed Mar 30 03:47:11 2005 +0000
@@ -1,12 +1,12 @@
# from: @(#)Makefile.inc 5.1 (Berkeley) 2/18/91
-# $NetBSD: Makefile.inc,v 1.45 2003/03/11 09:21:23 tshiozak Exp $
+# $NetBSD: Makefile.inc,v 1.46 2005/03/30 03:47:12 christos Exp $
# locale sources
.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \
ctypeio.c localeconv.c nl_langinfo.c setlocale.c setlocale1.c \
- setlocale32.c __mb_cur_max.c wcscoll.c wcstod.c \
+ setlocale32.c __mb_cur_max.c wcscoll.c wcsftime.c wcstod.c \
wcstol.c wcstoll.c wcstoimax.c wcstoul.c wcstoull.c wcstoumax.c \
wcsxfrm.c aliasname.c
MAN+= nl_langinfo.3 setlocale.3
diff -r c38d639ae661 -r 19aeea191925 lib/libc/locale/wcsftime.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libc/locale/wcsftime.c Wed Mar 30 03:47:11 2005 +0000
@@ -0,0 +1,112 @@
+/* $NetBSD: wcsftime.c,v 1.1 2005/03/30 03:47:12 christos Exp $ */
+/*-
+ * Copyright (c) 2002 Tim J. Robbins
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
+#else
+__RCSID("$NetBSD: wcsftime.c,v 1.1 2005/03/30 03:47:12 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <time.h>
+#include <wchar.h>
+
+/*
+ * Convert date and time to a wide-character string.
+ *
+ * This is the wide-character counterpart of strftime(). So that we do not
+ * have to duplicate the code of strftime(), we convert the format string to
+ * multibyte, call strftime(), then convert the result back into wide
+ * characters.
+ *
+ * This technique loses in the presence of stateful multibyte encoding if any
+ * of the conversions in the format string change conversion state. When
+ * stateful encoding is implemented, we will need to reset the state between
+ * format specifications in the format string.
+ */
+size_t
+wcsftime(wchar_t *wcs, size_t maxsize,
+ const wchar_t *format, const struct tm *timeptr)
+{
+ static const mbstate_t initial;
+ mbstate_t mbs;
+ char *dst, *dstp, *sformat;
+ size_t n, sflen;
+ int sverrno;
+
+ sformat = dst = NULL;
+
+ /*
+ * Convert the supplied format string to a multibyte representation
+ * for strftime(), which only handles single-byte characters.
+ */
+ mbs = initial;
+ sflen = wcsrtombs(NULL, &format, 0, &mbs);
+ if (sflen == (size_t)-1)
+ goto error;
+ if ((sformat = malloc(sflen + 1)) == NULL)
+ goto error;
+ mbs = initial;
+ wcsrtombs(sformat, &format, sflen + 1, &mbs);
+
+ /*
+ * Allocate memory for longest multibyte sequence that will fit
+ * into the caller's buffer and call strftime() to fill it.
+ * Then, copy and convert the result back into wide characters in
+ * the caller's buffer.
+ */
+ if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) {
+ /* maxsize is preposturously large - avoid int. overflow. */
+ errno = EINVAL;
+ goto error;
+ }
+ if ((dst = malloc(maxsize * MB_CUR_MAX)) == NULL)
+ goto error;
+ if (strftime(dst, maxsize, sformat, timeptr) == 0)
+ goto error;
+ dstp = dst;
+ mbs = initial;
+ n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &mbs);
+ if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL)
+ goto error;
+
+ free(sformat);
+ free(dst);
+ return n;
+
+error:
+ sverrno = errno;
+ free(sformat);
+ free(dst);
+ errno = sverrno;
+ return 0;
+}
Home |
Main Index |
Thread Index |
Old Index