From d73534e172b3e5d56aea71fe4545b40f18ef64ea Mon Sep 17 00:00:00 2001 From: Daniel Reinhold Date: Sat, 18 Jan 2003 09:29:44 +0000 Subject: [PATCH] added scanf() to stdio (very curious that this was not already in there!) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2477 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/posix/stdio/Jamfile | 1 + src/kernel/libroot/posix/stdio/scanf.c | 65 ++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 src/kernel/libroot/posix/stdio/scanf.c diff --git a/src/kernel/libroot/posix/stdio/Jamfile b/src/kernel/libroot/posix/stdio/Jamfile index aea3ec1ba2..762d87edbc 100644 --- a/src/kernel/libroot/posix/stdio/Jamfile +++ b/src/kernel/libroot/posix/stdio/Jamfile @@ -32,6 +32,7 @@ KernelMergeObject posix_stdio.o : <$(SOURCE_GRIST)>refill.c <$(SOURCE_GRIST)>rewind.c <$(SOURCE_GRIST)>rget.c + <$(SOURCE_GRIST)>scanf.c <$(SOURCE_GRIST)>sscanf.c <$(SOURCE_GRIST)>sprintf.c <$(SOURCE_GRIST)>stdio.c diff --git a/src/kernel/libroot/posix/stdio/scanf.c b/src/kernel/libroot/posix/stdio/scanf.c new file mode 100644 index 0000000000..40f23dbcca --- /dev/null +++ b/src/kernel/libroot/posix/stdio/scanf.c @@ -0,0 +1,65 @@ +/*- + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 +#ifdef __STDC__ +#include +#else +#include +#endif + +int +#ifdef __STDC__ +scanf(char const *fmt, ...) +#else +scanf(fmt, va_alist) + char *fmt; + va_dcl +#endif +{ + int ret; + va_list ap; + +#ifdef __STDC__ + va_start(ap, fmt); +#else + va_start(ap); +#endif + ret = __svfscanf(stdin, fmt, ap); + va_end(ap); + return (ret); +}