generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to the OpenBSD implementations of the wide scanf functions.

Browse Source 
This also gets us the C99 wcstoimax and wcstoumax, and a working fgetwc and
ungetwc, all of which are needed in the implementation.

This also brings several other files closer to upstream.

Change-Id: I23b025a8237a6dbb9aa50d2a96765ea729a85579
This commit is contained in:
Elliott Hughes
2014-04-29 16:28:56 -07:00
parent c6e563c87a
commit 01ae00f317
20 changed files with 1352 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
libc/stdio/wcio.h
View File

@@ -1,34 +1,34 @@
/*
* Copyright (C) 2008 The Android Open Source Project
/* $OpenBSD: wcio.h,v 1.2 2013/04/17 17:40:35 tedu Exp $ */
/* $NetBSD: wcio.h,v 1.3 2003/01/18 11:30:00 thorpej Exp $ */
/*-
* Copyright (c)2001 Citrus Project,
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * 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.
* 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 COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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
* 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.
*
* $Citrus$
*/
/* this file is only used to quiet the BSD stdio implementation
* since we don't implement wchar support at all
*/
#ifndef _WCIO_H_
#define _WCIO_H_
@@ -36,22 +36,46 @@
#define WCIO_UNGETWC_BUFSIZE 1
struct wchar_io_data {
int dummy;
mbstate_t wcio_mbstate_in;
mbstate_t wcio_mbstate_out;
wchar_t wcio_ungetwc_buf[WCIO_UNGETWC_BUFSIZE];
size_t wcio_ungetwc_inbuf;
int wcio_mode; /* orientation */
};
/* BIONIC: disable wchar support */
#define WCIO_GET(fp) \
((struct wchar_io_data*) 0)
(_EXT(fp) ? &(_EXT(fp)->_wcio) : (struct wchar_io_data *)0)
#define _SET_ORIENTATION(fp, mode) ((void)0)
#define _SET_ORIENTATION(fp, mode) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio && _wcio->wcio_mode == 0) \
_wcio->wcio_mode = (mode);\
} while (0)
/*
* WCIO_FREE should be called by fclose
*/
#define WCIO_FREE(fp) ((void)(0))
#define WCIO_FREE(fp) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio) { \
_wcio->wcio_mode = 0;\
_wcio->wcio_ungetwc_inbuf = 0;\
} \
} while (0)
#define WCIO_FREEUB(fp) ((void)0)
#define WCIO_FREEUB(fp) \
do {\
struct wchar_io_data *_wcio = WCIO_GET(fp); \
if (_wcio) { \
_wcio->wcio_ungetwc_inbuf = 0;\
} \
} while (0)
#define WCIO_INIT(fp) ((void)0)
#define WCIO_INIT(fp) \
memset(&(_EXT(fp)->_wcio), 0, sizeof(struct wchar_io_data))
#endif /*_WCIO_H_*/