JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-09-13 Artem B. Bityuckiy <dedekind@oktetlabs.ru>

Browse Source 
* libc/iconv/iconv.tex: Updated with new content.
        * libc/iconv/lib/iconvnls.c: Reference ICONV_DEFAULT_NLSPATH
        instead of NLS_DEFAULT_NLSPATH.
        * libc/iconv/lib/iconvnls.h: Fix typo.
        * libc/include/sys/iconvnls.h: New file.
This commit is contained in:
Jeff Johnston
2004-09-13 17:10:20 +00:00
parent de4e88a8df
commit d4c8e53b22
5 changed files with 1055 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
newlib/ChangeLog
View File

@@ -1,3 +1,11 @@
2004-09-13 Artem B. Bityuckiy <dedekind@oktetlabs.ru>
* libc/iconv/iconv.tex: Updated with new content.
* libc/iconv/lib/iconvnls.c: Reference ICONV_DEFAULT_NLSPATH
instead of NLS_DEFAULT_NLSPATH.
* libc/iconv/lib/iconvnls.h: Fix typo.
* libc/include/sys/iconvnls.h: New file.
2004-09-09 Paul Brook <paul@codesourcery.com>
* libc/include/sys/reent.h (struct _on_exit_args): Add _dso_handle

1107
newlib/libc/iconv/iconv.tex
View File

File diff suppressed because it is too large Load Diff

2
newlib/libc/iconv/lib/iconvnls.c
View File

@@ -71,7 +71,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
int dirlen = strlen (dir);
if ((path = _getenv_r (rptr, NLS_ENVVAR_NAME)) == NULL || *path == '\0')
path = NLS_DEFAULT_NLSPATH;
path = ICONV_DEFAULT_NLSPATH;
len1 = strlen (path);
len2 = strlen (file);

6
newlib/libc/iconv/lib/iconvnls.h
View File

@@ -1,5 +1,5 @@
#ifndef __INCOV_ICONVNLS_H__
#define __INCOV_ICONVNLS_H__
#ifndef __ICONV_ICONVNLS_H__
#define __ICONV_ICONVNLS_H__
#include <newlib.h>
@@ -33,5 +33,5 @@
# endif
#endif /* _MB_CAPABLE */
#endif /* !__INCOV_ICONVNLS_H__ */
#endif /* !__ICONV_ICONVNLS_H__ */

77
newlib/libc/include/sys/iconvnls.h Normal file
View File

@@ -0,0 +1,77 @@
/*
* Copyright (c) 2003-2004, Artem B. Bityuckiy.
* Rights transferred to Franklin Electronic Publishers.
*
* 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.
*/
/*
* Funtions, macros, etc implimented in iconv library but used by other
* NLS-related subsystems too.
*/
#ifndef __SYS_ICONVNLS_H__
#define __SYS_ICONVNLS_H__
#include <_ansi.h>
#include <reent.h>
#include <wchar.h>
#include <iconv.h>
/* Iconv data path environment variable name */
#define NLS_ENVVAR_NAME "NLSPATH"
/* Default NLSPATH value */
#define ICONV_DEFAULT_NLSPATH "/usr/locale"
/* Direction markers */
#define ICONV_NLS_FROM 0
#define ICONV_NLS_TO 1
_VOID
_EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
int
_EXFUN(_iconv_nls_set_state, (iconv_t cd, mbstate_t *ps, int direction));
int
_EXFUN(_iconv_nls_is_stateful, (iconv_t cd, int direction));
int
_EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
size_t
_EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
_CONST char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft));
_CONST char *
_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, _CONST char *file,
_CONST char *dir, _CONST char *ext));
int
_EXFUN(_iconv_nls_open, (struct _reent *rptr, _CONST char *encoding,
iconv_t *towc, iconv_t *fromwc, int flag));
char *
_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, _CONST char *ca));
#endif /* __SYS_ICONVNLS_H__ */