diff options
Diffstat (limited to 'lib/libc/iconv')
75 files changed, 44 insertions, 183 deletions
diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc index 09a51e1cdba2..08c2763c8f0d 100644 --- a/lib/libc/iconv/Makefile.inc +++ b/lib/libc/iconv/Makefile.inc @@ -1,5 +1,3 @@ -# $FreeBSD$ - # iconv sources .PATH: ${LIBC_SRCTOP}/iconv diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map index 8a9a75d519ed..d36e0733a4f0 100644 --- a/lib/libc/iconv/Symbol.map +++ b/lib/libc/iconv/Symbol.map @@ -1,7 +1,3 @@ -/* - * $FreeBSD$ - */ - FBSD_1.3 { __bsd___iconv; __bsd___iconv_free_list; @@ -19,15 +15,6 @@ FBSD_1.3 { FBSDprivate_1.0 { _citrus_bcs_convert_to_lower; _citrus_bcs_convert_to_upper; - _citrus_bcs_isalnum; - _citrus_bcs_isalpha; - _citrus_bcs_isblank; - _citrus_bcs_isdigit; - _citrus_bcs_iseol; - _citrus_bcs_islower; - _citrus_bcs_isspace; - _citrus_bcs_isupper; - _citrus_bcs_isxdigit; _citrus_bcs_skip_nonws; _citrus_bcs_skip_nonws_len; _citrus_bcs_skip_ws; @@ -36,12 +23,8 @@ FBSDprivate_1.0 { _citrus_bcs_strncasecmp; _citrus_bcs_strtol; _citrus_bcs_strtoul; - _citrus_bcs_tolower; - _citrus_bcs_toupper; _citrus_bcs_trunc_rws_len; - _citrus_bcs_trunc_ws_len; _citrus_csmapper_open; - _citrus_csmapper_close; _citrus_db_factory_add_by_string; _citrus_db_factory_add_string_by_string; _citrus_db_factory_add32_by_string; @@ -63,41 +46,16 @@ FBSDprivate_1.0 { _citrus_lookup_factory_convert; _citrus_map_file; _citrus_mapper_close; - _citrus_mapper_convert; _citrus_mapper_create_area; - _citrus_mapper_get_dst_max; - _citrus_mapper_get_src_max; - _citrus_mapper_get_state_size; - _citrus_mapper_init_state; _citrus_mapper_open; _citrus_mapper_open_direct; _citrus_mapper_set_persistent; - _citrus_memory_stream_bind; _citrus_memory_stream_chr; - _citrus_memory_stream_getc; _citrus_memory_stream_getln; - _citrus_memory_stream_getln_region; - _citrus_memory_stream_getregion; - _citrus_memory_stream_iseof; _citrus_memory_stream_matchline; - _citrus_memory_stream_peek; - _citrus_memory_stream_remainder; - _citrus_memory_stream_rewind; - _citrus_memory_stream_seek; _citrus_memory_stream_skip_ws; - _citrus_memory_stream_tell; - _citrus_memory_stream_ungetc; _citrus_pivot_factory_convert; - _citrus_prop_object_init; - _citrus_prop_object_uninit; _citrus_prop_parse_variable; - _citrus_prop_read_bool; - _citrus_prop_read_character; - _citrus_prop_read_character_common; - _citrus_prop_read_element; - _citrus_prop_read_num; - _citrus_prop_read_str; - _citrus_prop_read_symbol; _citrus_stdenc_close; _citrus_stdenc_open; _citrus_unmap_file; diff --git a/lib/libc/iconv/__iconv.c b/lib/libc/iconv/__iconv.c index 9fd0567087a2..3e412ee1eab7 100644 --- a/lib/libc/iconv/__iconv.c +++ b/lib/libc/iconv/__iconv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/__iconv_free_list.c b/lib/libc/iconv/__iconv_free_list.c index 0f2b92355e32..f5407562cb43 100644 --- a/lib/libc/iconv/__iconv_free_list.c +++ b/lib/libc/iconv/__iconv_free_list.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/__iconv_get_list.3 b/lib/libc/iconv/__iconv_get_list.3 index 14f1560d56f4..08d11c05918b 100644 --- a/lib/libc/iconv/__iconv_get_list.3 +++ b/lib/libc/iconv/__iconv_get_list.3 @@ -32,8 +32,6 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD$ -.\" .Dd October 20, 2009 .Dt __ICONV_GET_LIST 3 .Os diff --git a/lib/libc/iconv/__iconv_get_list.c b/lib/libc/iconv/__iconv_get_list.c index cb80ed78ef48..49f23f45bf0a 100644 --- a/lib/libc/iconv/__iconv_get_list.c +++ b/lib/libc/iconv/__iconv_get_list.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h index dee7bab733e8..94a13c56db98 100644 --- a/lib/libc/iconv/_strtol.h +++ b/lib/libc/iconv/_strtol.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: _strtol.h,v 1.2 2009/05/20 22:03:29 christos Exp $ */ /*- @@ -84,11 +83,21 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == '0' && (*s == 'b' || *s == 'B') && + (s[1] >= '0' && s[1] <= '1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = (c == '0' ? 8 : 10); diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h index 2dd3e92ba302..4944e1fb06e0 100644 --- a/lib/libc/iconv/_strtoul.h +++ b/lib/libc/iconv/_strtoul.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */ /*- @@ -80,11 +79,21 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == '0' && (*s == 'b' || *s == 'B') && + (s[1] >= '0' && s[1] <= '1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = (c == '0' ? 8 : 10); diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c index 5a0f523b9d15..d3da6fd1a271 100644 --- a/lib/libc/iconv/bsd_iconv.c +++ b/lib/libc/iconv/bsd_iconv.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */ /*- @@ -30,7 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/queue.h> #include <sys/types.h> @@ -71,8 +69,6 @@ __bsd___iconv_open(const char *out, const char *in, struct _citrus_iconv *handle } handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE"); - handle->cv_shared->ci_ilseq_invalid = false; - handle->cv_shared->ci_hooks = NULL; return ((iconv_t)(void *)handle); } diff --git a/lib/libc/iconv/citrus_aliasname_local.h b/lib/libc/iconv/citrus_aliasname_local.h index 0dc883a54c92..e4ae8c70562c 100644 --- a/lib/libc/iconv/citrus_aliasname_local.h +++ b/lib/libc/iconv/citrus_aliasname_local.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_bcs.c b/lib/libc/iconv/citrus_bcs.c index cd88ea7fe2fd..8409e1fbac7b 100644 --- a/lib/libc/iconv/citrus_bcs.c +++ b/lib/libc/iconv/citrus_bcs.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <stdlib.h> diff --git a/lib/libc/iconv/citrus_bcs.h b/lib/libc/iconv/citrus_bcs.h index 3bf6f72e988e..ba4d97aa7c3f 100644 --- a/lib/libc/iconv/citrus_bcs.h +++ b/lib/libc/iconv/citrus_bcs.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_bcs.h,v 1.6 2009/01/11 02:46:24 christos Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_bcs_strtol.c b/lib/libc/iconv/citrus_bcs_strtol.c index fda263b6479f..55d4d1ca565d 100644 --- a/lib/libc/iconv/citrus_bcs_strtol.c +++ b/lib/libc/iconv/citrus_bcs_strtol.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $ */ /*- @@ -30,7 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <errno.h> diff --git a/lib/libc/iconv/citrus_bcs_strtoul.c b/lib/libc/iconv/citrus_bcs_strtoul.c index 981aa5ad1b8c..280397a72428 100644 --- a/lib/libc/iconv/citrus_bcs_strtoul.c +++ b/lib/libc/iconv/citrus_bcs_strtoul.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $ */ /*- @@ -30,7 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <errno.h> diff --git a/lib/libc/iconv/citrus_csmapper.c b/lib/libc/iconv/citrus_csmapper.c index 90d52cba2ce3..642abafbe9a2 100644 --- a/lib/libc/iconv/citrus_csmapper.c +++ b/lib/libc/iconv/citrus_csmapper.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/endian.h> #include <sys/types.h> #include <sys/queue.h> diff --git a/lib/libc/iconv/citrus_csmapper.h b/lib/libc/iconv/citrus_csmapper.h index cdc7b0e3375e..d19e754adb44 100644 --- a/lib/libc/iconv/citrus_csmapper.h +++ b/lib/libc/iconv/citrus_csmapper.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_csmapper.h,v 1.3 2013/06/24 17:28:35 joerg Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_db.c b/lib/libc/iconv/citrus_db.c index 09df5bfaf07f..bb74668a2d4c 100644 --- a/lib/libc/iconv/citrus_db.c +++ b/lib/libc/iconv/citrus_db.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/endian.h> #include <sys/types.h> diff --git a/lib/libc/iconv/citrus_db.h b/lib/libc/iconv/citrus_db.h index fd46675a5d0b..b885df55c53f 100644 --- a/lib/libc/iconv/citrus_db.h +++ b/lib/libc/iconv/citrus_db.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c index fd3375d6b2e0..c1753195c767 100644 --- a/lib/libc/iconv/citrus_db_factory.c +++ b/lib/libc/iconv/citrus_db_factory.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/queue.h> diff --git a/lib/libc/iconv/citrus_db_factory.h b/lib/libc/iconv/citrus_db_factory.h index c542046532c1..cf3c1b166cb7 100644 --- a/lib/libc/iconv/citrus_db_factory.h +++ b/lib/libc/iconv/citrus_db_factory.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db_factory.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_db_file.h b/lib/libc/iconv/citrus_db_file.h index 7eea27694746..6fedc6064646 100644 --- a/lib/libc/iconv/citrus_db_file.h +++ b/lib/libc/iconv/citrus_db_file.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db_file.h,v 1.4 2008/02/10 05:58:22 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_db_hash.c b/lib/libc/iconv/citrus_db_hash.c index 1033c3fe8867..24b7213ee268 100644 --- a/lib/libc/iconv/citrus_db_hash.c +++ b/lib/libc/iconv/citrus_db_hash.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_db_hash.h b/lib/libc/iconv/citrus_db_hash.h index ca2caa5282af..5f8703396502 100644 --- a/lib/libc/iconv/citrus_db_hash.h +++ b/lib/libc/iconv/citrus_db_hash.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_db_hash.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_esdb.c b/lib/libc/iconv/citrus_esdb.c index a07d5d09e72f..65b518f838c6 100644 --- a/lib/libc/iconv/citrus_esdb.c +++ b/lib/libc/iconv/citrus_esdb.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_esdb.h b/lib/libc/iconv/citrus_esdb.h index a2fb8041554d..3c4ef2f7e1e6 100644 --- a/lib/libc/iconv/citrus_esdb.h +++ b/lib/libc/iconv/citrus_esdb.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_esdb.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_esdb_file.h b/lib/libc/iconv/citrus_esdb_file.h index 518d35587326..81548d49c061 100644 --- a/lib/libc/iconv/citrus_esdb_file.h +++ b/lib/libc/iconv/citrus_esdb_file.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_esdb_file.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_fix_grouping.h b/lib/libc/iconv/citrus_fix_grouping.h index 31f9c23f42de..460989426b53 100644 --- a/lib/libc/iconv/citrus_fix_grouping.h +++ b/lib/libc/iconv/citrus_fix_grouping.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_fix_grouping.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_hash.c b/lib/libc/iconv/citrus_hash.c index aff6d55bcfbd..3a34efde3044 100644 --- a/lib/libc/iconv/citrus_hash.c +++ b/lib/libc/iconv/citrus_hash.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_hash.h b/lib/libc/iconv/citrus_hash.h index 62f2ae23b872..d44571d00a40 100644 --- a/lib/libc/iconv/citrus_hash.h +++ b/lib/libc/iconv/citrus_hash.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_hash.h,v 1.3 2004/01/02 21:49:35 itojun Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c index 88dfc2deca33..e785e6721968 100644 --- a/lib/libc/iconv/citrus_iconv.c +++ b/lib/libc/iconv/citrus_iconv.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/queue.h> @@ -81,8 +79,9 @@ init_cache(void) _CITRUS_HASH_INIT(&shared_pool, CI_HASH_SIZE); TAILQ_INIT(&shared_unused); shared_max_reuse = -1; - if (!issetugid() && getenv(CI_ENV_MAX_REUSE)) - shared_max_reuse = atoi(getenv(CI_ENV_MAX_REUSE)); + if (secure_getenv(CI_ENV_MAX_REUSE) != NULL) + shared_max_reuse = + atoi(secure_getenv(CI_ENV_MAX_REUSE)); if (shared_max_reuse < 0) shared_max_reuse = CI_INITIAL_MAX_REUSE; isinit = true; @@ -140,14 +139,11 @@ open_shared(struct _citrus_iconv_shared * __restrict * __restrict rci, /* initialize iconv handle */ len_convname = strlen(convname); - ci = malloc(sizeof(*ci) + len_convname + 1); + ci = calloc(1, sizeof(*ci) + len_convname + 1); if (!ci) { ret = errno; goto err; } - ci->ci_module = NULL; - ci->ci_ops = NULL; - ci->ci_closure = NULL; ci->ci_convname = (void *)&ci[1]; memcpy(ci->ci_convname, convname, len_convname + 1); diff --git a/lib/libc/iconv/citrus_iconv.h b/lib/libc/iconv/citrus_iconv.h index 8fe630af6c2d..49117cc15051 100644 --- a/lib/libc/iconv/citrus_iconv.h +++ b/lib/libc/iconv/citrus_iconv.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_iconv_local.h b/lib/libc/iconv/citrus_iconv_local.h index bd02d085d1ca..0374a05c324c 100644 --- a/lib/libc/iconv/citrus_iconv_local.h +++ b/lib/libc/iconv/citrus_iconv_local.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_lock.h b/lib/libc/iconv/citrus_lock.h index 3daaf1c31dd0..7c42e7bc7c26 100644 --- a/lib/libc/iconv/citrus_lock.h +++ b/lib/libc/iconv/citrus_lock.h @@ -1,6 +1,5 @@ -/* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2010 Gabor Kovesdan <gabor@FreeBSD.org> * All rights reserved. diff --git a/lib/libc/iconv/citrus_lookup.c b/lib/libc/iconv/citrus_lookup.c index 51a82951376c..ed224001bffb 100644 --- a/lib/libc/iconv/citrus_lookup.c +++ b/lib/libc/iconv/citrus_lookup.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_lookup.h b/lib/libc/iconv/citrus_lookup.h index 88a0d4e7ef51..53ce42ea943b 100644 --- a/lib/libc/iconv/citrus_lookup.h +++ b/lib/libc/iconv/citrus_lookup.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_lookup.h,v 1.2 2004/07/21 14:16:34 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_lookup_factory.c b/lib/libc/iconv/citrus_lookup_factory.c index 85d20dfe8cfe..59b119e24872 100644 --- a/lib/libc/iconv/citrus_lookup_factory.c +++ b/lib/libc/iconv/citrus_lookup_factory.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <ctype.h> diff --git a/lib/libc/iconv/citrus_lookup_factory.h b/lib/libc/iconv/citrus_lookup_factory.h index e716184a8d17..e630578b931e 100644 --- a/lib/libc/iconv/citrus_lookup_factory.h +++ b/lib/libc/iconv/citrus_lookup_factory.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_lookup_factory.h,v 1.1 2003/06/25 09:51:35 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_lookup_file.h b/lib/libc/iconv/citrus_lookup_file.h index a2ada5fc7d5c..c7510d134d00 100644 --- a/lib/libc/iconv/citrus_lookup_file.h +++ b/lib/libc/iconv/citrus_lookup_file.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_lookup_file.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_mapper.c b/lib/libc/iconv/citrus_mapper.c index cbc0a58c35c9..45ea2d65de48 100644 --- a/lib/libc/iconv/citrus_mapper.c +++ b/lib/libc/iconv/citrus_mapper.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/queue.h> diff --git a/lib/libc/iconv/citrus_mapper.h b/lib/libc/iconv/citrus_mapper.h index 7e9056c761e9..ae093fc97ce3 100644 --- a/lib/libc/iconv/citrus_mapper.h +++ b/lib/libc/iconv/citrus_mapper.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_mapper.h,v 1.3 2003/07/12 15:39:19 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_mapper_local.h b/lib/libc/iconv/citrus_mapper_local.h index cfdb3be868e2..cb18e2eae8c1 100644 --- a/lib/libc/iconv/citrus_mapper_local.h +++ b/lib/libc/iconv/citrus_mapper_local.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_mapper_local.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_memstream.c b/lib/libc/iconv/citrus_memstream.c index 51092cb792b7..10918bf2c5e0 100644 --- a/lib/libc/iconv/citrus_memstream.c +++ b/lib/libc/iconv/citrus_memstream.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <stdio.h> diff --git a/lib/libc/iconv/citrus_memstream.h b/lib/libc/iconv/citrus_memstream.h index 4c398a8c7a5b..998aeefe1dff 100644 --- a/lib/libc/iconv/citrus_memstream.h +++ b/lib/libc/iconv/citrus_memstream.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_memstream.h,v 1.3 2005/05/14 17:55:42 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_mmap.c b/lib/libc/iconv/citrus_mmap.c index e058f3d2cdc3..7686a389edec 100644 --- a/lib/libc/iconv/citrus_mmap.c +++ b/lib/libc/iconv/citrus_mmap.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $ */ /*- @@ -30,7 +29,6 @@ */ #include "namespace.h" -#include <sys/cdefs.h> #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libc/iconv/citrus_mmap.h b/lib/libc/iconv/citrus_mmap.h index 83520646f378..b06ddd4909c6 100644 --- a/lib/libc/iconv/citrus_mmap.h +++ b/lib/libc/iconv/citrus_mmap.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_mmap.h,v 1.1 2003/06/25 09:51:38 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_module.c b/lib/libc/iconv/citrus_module.c index bd173b41bb04..1d862ed6ccad 100644 --- a/lib/libc/iconv/citrus_module.c +++ b/lib/libc/iconv/citrus_module.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $ */ /*- @@ -90,7 +89,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> @@ -282,8 +280,8 @@ _citrus_load_module(_citrus_module_t *rhandle, const char *encname) int maj, min; if (_pathI18nModule == NULL) { - p = getenv("PATH_I18NMODULE"); - if (p != NULL && !issetugid()) { + p = secure_getenv("PATH_I18NMODULE"); + if (p != NULL) { _pathI18nModule = strdup(p); if (_pathI18nModule == NULL) return (ENOMEM); diff --git a/lib/libc/iconv/citrus_module.h b/lib/libc/iconv/citrus_module.h index 0bcb53e2efa5..c733fb1fe3cb 100644 --- a/lib/libc/iconv/citrus_module.h +++ b/lib/libc/iconv/citrus_module.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_module.h,v 1.1 2002/03/17 22:14:20 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_namespace.h b/lib/libc/iconv/citrus_namespace.h index ef2c01b97f06..454e9ca2bdc4 100644 --- a/lib/libc/iconv/citrus_namespace.h +++ b/lib/libc/iconv/citrus_namespace.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_namespace.h,v 1.8 2009/01/11 02:46:24 christos Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_none.c b/lib/libc/iconv/citrus_none.c index 033fe4011e00..194d78853955 100644 --- a/lib/libc/iconv/citrus_none.c +++ b/lib/libc/iconv/citrus_none.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */ /*- @@ -30,7 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_none.h b/lib/libc/iconv/citrus_none.h index a0ebd61f296e..241b4db1cd58 100644 --- a/lib/libc/iconv/citrus_none.h +++ b/lib/libc/iconv/citrus_none.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_none.h,v 1.3 2003/06/25 09:51:38 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_pivot_factory.c b/lib/libc/iconv/citrus_pivot_factory.c index c307a9d5aa32..ed5e6863beab 100644 --- a/lib/libc/iconv/citrus_pivot_factory.c +++ b/lib/libc/iconv/citrus_pivot_factory.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/queue.h> #include <assert.h> diff --git a/lib/libc/iconv/citrus_pivot_factory.h b/lib/libc/iconv/citrus_pivot_factory.h index adbfc8c77524..0b4d8513f732 100644 --- a/lib/libc/iconv/citrus_pivot_factory.h +++ b/lib/libc/iconv/citrus_pivot_factory.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_pivot_factory.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_pivot_file.h b/lib/libc/iconv/citrus_pivot_file.h index b2b4f2408dba..24b9101b9071 100644 --- a/lib/libc/iconv/citrus_pivot_file.h +++ b/lib/libc/iconv/citrus_pivot_file.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_pivot_file.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_prop.c b/lib/libc/iconv/citrus_prop.c index 0b627f362c22..6dadce92e3eb 100644 --- a/lib/libc/iconv/citrus_prop.c +++ b/lib/libc/iconv/citrus_prop.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_prop.c,v 1.4 2011/03/30 08:22:01 jruoho Exp $ */ /*- @@ -30,7 +29,6 @@ * */ -#include <sys/cdefs.h> #include <assert.h> #include <errno.h> diff --git a/lib/libc/iconv/citrus_prop.h b/lib/libc/iconv/citrus_prop.h index f09c833b8da6..065055f0d9bc 100644 --- a/lib/libc/iconv/citrus_prop.h +++ b/lib/libc/iconv/citrus_prop.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_region.h b/lib/libc/iconv/citrus_region.h index 0a78eec2b85c..f84d4163e240 100644 --- a/lib/libc/iconv/citrus_region.h +++ b/lib/libc/iconv/citrus_region.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_region.h,v 1.7 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_stdenc.c b/lib/libc/iconv/citrus_stdenc.c index 2bc79a11d333..c4778132750b 100644 --- a/lib/libc/iconv/citrus_stdenc.c +++ b/lib/libc/iconv/citrus_stdenc.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $ */ /*- @@ -29,7 +28,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <assert.h> #include <errno.h> diff --git a/lib/libc/iconv/citrus_stdenc.h b/lib/libc/iconv/citrus_stdenc.h index da48093c15da..daab0d9afe2b 100644 --- a/lib/libc/iconv/citrus_stdenc.h +++ b/lib/libc/iconv/citrus_stdenc.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_stdenc_local.h b/lib/libc/iconv/citrus_stdenc_local.h index 9e4b827e830b..8d26fc3cf2cd 100644 --- a/lib/libc/iconv/citrus_stdenc_local.h +++ b/lib/libc/iconv/citrus_stdenc_local.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_stdenc_template.h b/lib/libc/iconv/citrus_stdenc_template.h index ad19787bc1bc..ef95bf71ad07 100644 --- a/lib/libc/iconv/citrus_stdenc_template.h +++ b/lib/libc/iconv/citrus_stdenc_template.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */ /*- diff --git a/lib/libc/iconv/citrus_types.h b/lib/libc/iconv/citrus_types.h index 2e4be11dd4cd..55ef4929ec6f 100644 --- a/lib/libc/iconv/citrus_types.h +++ b/lib/libc/iconv/citrus_types.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $ */ /*- diff --git a/lib/libc/iconv/iconv-internal.h b/lib/libc/iconv/iconv-internal.h index 731b6856ca22..4c691441f705 100644 --- a/lib/libc/iconv/iconv-internal.h +++ b/lib/libc/iconv/iconv-internal.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ /* diff --git a/lib/libc/iconv/iconv.3 b/lib/libc/iconv/iconv.3 index 1a4f8c3cfd75..577b537e5c21 100644 --- a/lib/libc/iconv/iconv.3 +++ b/lib/libc/iconv/iconv.3 @@ -1,4 +1,3 @@ -.\" $FreeBSD$ .\" $NetBSD: iconv.3,v 1.12 2004/08/02 13:38:21 tshiozak Exp $ .\" .\" Copyright (c) 2003 Citrus Project, diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c index 57c614029df0..5034b39a6566 100644 --- a/lib/libc/iconv/iconv.c +++ b/lib/libc/iconv/iconv.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconv_canonicalize.3 b/lib/libc/iconv/iconv_canonicalize.3 index d98235aabbfd..c1d0c6522500 100644 --- a/lib/libc/iconv/iconv_canonicalize.3 +++ b/lib/libc/iconv/iconv_canonicalize.3 @@ -32,8 +32,6 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD$ -.\" .Dd October 20, 2009 .Dt ICONV_CANONICALIZE 3 .Os diff --git a/lib/libc/iconv/iconv_canonicalize.c b/lib/libc/iconv/iconv_canonicalize.c index 7c3e6f0fdbae..c906f5f3388a 100644 --- a/lib/libc/iconv/iconv_canonicalize.c +++ b/lib/libc/iconv/iconv_canonicalize.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconv_close.c b/lib/libc/iconv/iconv_close.c index f7d0231afcd8..d61dfd3622ce 100644 --- a/lib/libc/iconv/iconv_close.c +++ b/lib/libc/iconv/iconv_close.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconv_compat.c b/lib/libc/iconv/iconv_compat.c index 2a6a120aa2cd..ade815c1a4c1 100644 --- a/lib/libc/iconv/iconv_compat.c +++ b/lib/libc/iconv/iconv_compat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ /* diff --git a/lib/libc/iconv/iconv_open.c b/lib/libc/iconv/iconv_open.c index a386f13007b1..a8ddb0919292 100644 --- a/lib/libc/iconv/iconv_open.c +++ b/lib/libc/iconv/iconv_open.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconv_open_into.c b/lib/libc/iconv/iconv_open_into.c index 9db00c3e7710..dc4f5002a730 100644 --- a/lib/libc/iconv/iconv_open_into.c +++ b/lib/libc/iconv/iconv_open_into.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconv_set_relocation_prefix.c b/lib/libc/iconv/iconv_set_relocation_prefix.c index 969381c12984..8832892bba09 100644 --- a/lib/libc/iconv/iconv_set_relocation_prefix.c +++ b/lib/libc/iconv/iconv_set_relocation_prefix.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconvctl.3 b/lib/libc/iconv/iconvctl.3 index d6bc67f9b98d..b9a75e0a7eb9 100644 --- a/lib/libc/iconv/iconvctl.3 +++ b/lib/libc/iconv/iconvctl.3 @@ -32,8 +32,6 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD$ -.\" .Dd November 25, 2009 .Dt ICONVCTL 3 .Os diff --git a/lib/libc/iconv/iconvctl.c b/lib/libc/iconv/iconvctl.c index d6357f637752..412a5e20b860 100644 --- a/lib/libc/iconv/iconvctl.c +++ b/lib/libc/iconv/iconvctl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> diff --git a/lib/libc/iconv/iconvlist.3 b/lib/libc/iconv/iconvlist.3 index b1a6e0564341..90d431da748e 100644 --- a/lib/libc/iconv/iconvlist.3 +++ b/lib/libc/iconv/iconvlist.3 @@ -32,9 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD$ -.\" -.Dd October 20, 2009 +.Dd February 23, 2023 .Dt ICONVLIST 3 .Os .Sh NAME @@ -47,7 +45,7 @@ .In iconv.h .Ft void .Fo iconvlist -.Fa "int \*[lp]*do_one\*[rp]\*[lp]unsigned int *count, const char * const *names, void *arg\*[rp]" +.Fa "int \*[lp]*do_one\*[rp]\*[lp]unsigned int count, const char * const *names, void *arg\*[rp]" .Fa "void *arg" .Fc .Sh DESCRIPTION diff --git a/lib/libc/iconv/iconvlist.c b/lib/libc/iconv/iconvlist.c index dbd0a1eddf99..48bcacbd389d 100644 --- a/lib/libc/iconv/iconvlist.c +++ b/lib/libc/iconv/iconvlist.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Peter Wemm * All rights reserved. @@ -24,8 +24,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/types.h> |