Standard Libraries for EDK II.

This set of three packages: AppPkg, StdLib, StdLibPrivateInternalFiles; contains the implementation of libraries based upon non-UEFI standards such as ISO/IEC-9899, the library portion of the C Language Standard, POSIX, etc.

AppPkg contains applications that make use of the standard libraries defined in the StdLib Package.

StdLib contains header (include) files and the implementations of the standard libraries.

StdLibPrivateInternalFiles contains files for the exclusive use of the library implementations in StdLib.  These files should never be directly referenced from applications or other code.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11600 6f19259b-4bc3-4df7-8a09-765794883524

StdLib/LibC/Stdio/Stdio.inf

@@ -0,0 +1,142 @@
+## @file
+#  Standard C library: Implementation for <stdio.h>.
+#
+#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#
+#  This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x00010005
+  BASE_NAME                      = LibStdio
+  FILE_GUID                      = 7d2bd134-500d-4f42-aee2-26accfb6cb1d
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  LIBRARY_CLASS                  = LibStdio
+
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF
+#
+
+[Sources]
+  clrerr.c            #
+  fclose.c            #
+  fdopen.c            #
+  feof.c              #
+  ferror.c            #
+  fflush.c            #
+  fgetc.c             #
+  fgetln.c            #
+  fgetpos.c           #
+  fgets.c             #
+  fopen.c             #
+  fprintf.c           #
+  fputc.c             #
+  fputs.c             #
+  fread.c             #
+  freopen.c           #
+  fscanf.c            #
+  fseek.c             #
+  fsetpos.c           #
+  ftell.c             #
+  fwrite.c            #
+  getc.c              #
+  getchar.c           #
+  gets.c              #
+  perror.c            #
+  printf.c            #
+  putc.c              #
+  putchar.c           #
+  puts.c              #
+  remove.c            #
+  rewind.c            #
+  scanf.c             #
+  setbuf.c            #
+  setvbuf.c           #
+  sprintf.c           #
+  sscanf.c            #
+  tmpfile.c           #
+  tmpnam.c            #
+  ungetc.c            #
+  vfprintf.c          #
+  vfwprintf.c         #
+  vprintf.c           #
+  vsprintf.c          #
+
+  # Wide character functions
+  fgetwc.c            #
+  fgetws.c            #
+  fputwc.c            #
+  fputws.c            #
+  fwide.c             #
+  fwprintf.c          #
+  fwscanf.c           #
+  getwc.c             #
+  getwchar.c          #
+  putwc.c             #
+  putwchar.c          #
+  swprintf.c          #
+  swscanf.c           #
+  ungetwc.c           #
+  vfwscanf.c          #
+  vswprintf.c         #
+  vswscanf.c          #
+  vwprintf.c          #
+  vwscanf.c           #
+  wprintf.c           #
+  wscanf.c            #
+
+
+  # Files internal to the implementation
+  fgetstr.c           #
+  findfp.c            #
+  flags.c             #
+  fseeko.c            #
+  ftello.c            #
+  fvwrite.c           #
+  fwalk.c             #
+  gettemp.c           #
+  makebuf.c           #
+  mkstemp.c           #
+  mktemp.c            #
+  refill.c            #
+  rget.c              #
+  snprintf.c          #
+  stdio.c             #
+  vfscanf.c           #
+  wbuf.c              #
+  wsetup.c            #
+
+
+[Packages]
+  StdLib/StdLib.dec
+  StdLibPrivateInternalFiles/DoNotUse.dec
+  MdePkg/MdePkg.dec
+  ShellPkg/ShellPkg.dec
+
+[LibraryClasses]
+  LibC
+  LibCType
+  LibGdtoa
+  LibLocale
+  LibStdLib
+  LibString
+  LibTime
+  LibUefi
+  LibWchar
+
+################################################################
+#
+# The Build Options, below, are only used when building the C library.
+# DO NOT use them when building your application!
+# Nasty things could happen if you do.
+#
+[BuildOptions]
+  GCC:*_*_*_CC_FLAGS    = -fno-builtin -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast

StdLib/LibC/Stdio/clrerr.c

@@ -0,0 +1,63 @@
+/** @file
+    Implementation of clearerr as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: clrerr.c,v 1.10 2003/08/07 16:43:21 agc Exp
+    clrerr.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#undef  clearerr
+
+void
+clearerr(FILE *fp)
+{
+  //_DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  __sclearerr(fp);
+  FUNLOCKFILE(fp);
+}

StdLib/LibC/Stdio/fclose.c

@@ -0,0 +1,83 @@
+/** @file
+    Implementation of fclose as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fclose.c,v 1.16 2003/08/07 16:43:22 agc Exp
+    fclose.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+fclose(FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  if (fp->_flags == 0) {  /* not open! */
+    errno = EBADF;
+    return (EOF);
+  }
+  FLOCKFILE(fp);
+  WCIO_FREE(fp);
+  r = fp->_flags & __SWR ? __sflush(fp) : 0;
+  if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
+    r = EOF;
+  if (fp->_flags & __SMBF)
+    free((char *)fp->_bf._base);
+  if (HASUB(fp))
+    FREEUB(fp);
+  if (HASLB(fp))
+    FREELB(fp);
+  FUNLOCKFILE(fp);
+  fp->_file = -1;
+  fp->_flags = 0;   /* Release this FILE for reuse. */
+  fp->_r = fp->_w = 0;  /* Mess up if reaccessed. */
+  return (r);
+}

StdLib/LibC/Stdio/fdopen.c

@@ -0,0 +1,108 @@
+/*  $NetBSD: fdopen.c,v 1.14 2003/08/07 16:43:22 agc Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fdopen.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fdopen.c,v 1.14 2003/08/07 16:43:22 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  "namespace.h"
+#include  <sys/types.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <fcntl.h>
+#include  <sys/EfiSysCall.h>
+#include  <stdio.h>
+
+#include  "reentrant.h"
+#include  "local.h"
+
+#ifdef __weak_alias
+__weak_alias(fdopen,_fdopen)
+#endif
+
+FILE *
+fdopen(int fd, const char *mode)
+{
+  FILE *fp;
+  int flags, oflags, fdflags, tmp;
+
+  _DIAGASSERT(fd != -1);
+
+  if ((flags = __sflags(mode, &oflags)) == 0)
+    return (NULL);
+
+  /* Make sure the mode the user wants is a subset of the actual mode. */
+  if ((fdflags = fcntl(fd, F_GETFL, 0)) < 0)
+    return (NULL);
+  tmp = fdflags & O_ACCMODE;
+  if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) {
+    errno = EINVAL;
+    return (NULL);
+  }
+
+  if (oflags & O_NONBLOCK) {
+    struct stat st;
+    if (fstat(fd, &st) == -1) {
+      return (NULL);
+    }
+    if (!S_ISREG(st.st_mode)) {
+      errno = EFTYPE;
+      return (NULL);
+    }
+  }
+
+  if ((fp = __sfp()) == NULL)
+    return (NULL);
+  fp->_flags = (unsigned short)flags;
+  /*
+   * If opened for appending, but underlying descriptor does not have
+   * O_APPEND bit set, assert __SAPP so that __swrite() will lseek to
+   * end before each write.
+   */
+  if ((oflags & O_APPEND) && !(fdflags & O_APPEND))
+    fp->_flags |= __SAPP;
+  fp->_file = (short)fd;
+  fp->_cookie = fp;
+  fp->_read = __sread;
+  fp->_write = __swrite;
+  fp->_seek = __sseek;
+  fp->_close = __sclose;
+  return (fp);
+}

StdLib/LibC/Stdio/feof.c

@@ -0,0 +1,67 @@
+/** @file
+    Implementation of a subroutine version of the macro feof,
+    as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: feof.c,v 1.11 2003/08/07 16:43:22 agc Exp
+    feof.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#undef feof
+
+int
+feof(FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sfeof(fp);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/ferror.c

@@ -0,0 +1,67 @@
+/** @file
+    Implementation of a subroutine version of the macro ferror,
+    as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: ferror.c,v 1.11 2003/08/07 16:43:22 agc Exp
+    ferror.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#undef ferror
+
+int
+ferror(FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sferror(fp);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/fflush.c

@@ -0,0 +1,115 @@
+/** @file
+    Implementation of fflush as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fflush.c,v 1.15 2003/08/07 16:43:22 agc Exp
+    fflush.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef _REENTRANT
+extern rwlock_t __sfp_lock;
+#endif
+
+/* Flush a single file, or (if fp is NULL) all files.  */
+int
+fflush(FILE *fp)
+{
+  int r;
+
+  if (fp == NULL) {
+    rwlock_rdlock(&__sfp_lock);
+    r = _fwalk(__sflush);
+    rwlock_unlock(&__sfp_lock);
+    return r;
+  }
+
+  FLOCKFILE(fp);
+  if ((fp->_flags & (__SWR | __SRW)) == 0) {
+    errno = EBADF;
+    r = EOF;
+  } else {
+    r = __sflush(fp);
+  }
+  FUNLOCKFILE(fp);
+  return r;
+}
+
+int
+__sflush(FILE *fp)
+{
+  unsigned char *p;
+  INT64 n;
+  int   t;
+
+  _DIAGASSERT(fp != NULL);
+
+  t = fp->_flags;
+  if ((t & __SWR) == 0)
+    return (0);
+
+  if ((p = fp->_bf._base) == NULL)
+    return (0);
+
+  n = fp->_p - p;   /* write this much */
+
+  /*
+   * Set these immediately to avoid problems with longjmp and to allow
+   * exchange buffering (via setvbuf) in user write function.
+   */
+  fp->_p = p;
+  fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
+
+  for (; n > 0; n -= t, p += t) {
+    t = (*fp->_write)(fp->_cookie, (char *)p, (int)n);
+    if (t <= 0) {
+      fp->_flags |= __SERR;
+      return (EOF);
+    }
+  }
+  return (0);
+}

StdLib/LibC/Stdio/fgetc.c

@@ -0,0 +1,65 @@
+/** @file
+    Implementation of fgetc as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fgetc.c,v 1.11 2003/08/07 16:43:22 agc Exp
+    fgetc.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+fgetc(FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sgetc(fp);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/fgetln.c

@@ -0,0 +1,71 @@
+/*  $NetBSD: fgetln.c,v 1.14 2004/05/10 16:47:11 drochner Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fgetline.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fgetln.c,v 1.14 2004/05/10 16:47:11 drochner Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(fgetln,_fgetln)
+#endif
+
+/*
+ * Get an input line.  The returned pointer often (but not always)
+ * points into a stdio buffer.  Fgetline does not alter the text of
+ * the returned line (which is thus not a C string because it will
+ * not necessarily end with '\0'), but does allow callers to modify
+ * it if they wish.  Thus, we set __SMOD in case the caller does.
+ */
+char *
+fgetln(FILE *fp, size_t *lenp)
+{
+  char *cp;
+
+  FLOCKFILE(fp);
+  cp = __fgetstr(fp, lenp, '\n');
+  FUNLOCKFILE(fp);
+  return cp;
+}

StdLib/LibC/Stdio/fgetpos.c

@@ -0,0 +1,60 @@
+/** @file
+    Implementation of fgetpos as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fgetpos.c,v 1.11 2003/08/07 16:43:23 agc Exp
+    fgetpos.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+int
+fgetpos(FILE *fp, fpos_t *pos)
+{
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(pos != NULL);
+
+  return((*pos = (off_t)ftello(fp)) == (off_t)-1);
+}

StdLib/LibC/Stdio/fgets.c

@@ -0,0 +1,119 @@
+/** @file
+    Implementation of fgets as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fgets.c,v 1.20 2003/12/14 23:56:28 lukem Exp
+    fgets.c 8.2 (Berkeley) 12/22/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Read at most n-1 characters from the given file.
+ * Stop when a newline has been read, or the count runs out.
+ * Return first argument, or NULL if no characters were read.
+ */
+char *
+fgets(char *buf, int n, FILE *fp)
+{
+  size_t len;
+  char *s;
+  unsigned char *p, *t;
+
+  _DIAGASSERT(buf != NULL);
+  _DIAGASSERT(fp != NULL);
+  if (n <= 0)         /* sanity check */
+    return (NULL);
+
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, -1);
+  s = buf;
+  n--;      /* leave space for NUL */
+  while (n != 0) {
+    /*
+     * If the buffer is empty, refill it.
+     */
+    if (fp->_r <= 0) {
+      if (__srefill(fp)) {
+        /* EOF/error: stop with partial or no line */
+        if (s == buf) {
+          FUNLOCKFILE(fp);
+          return (NULL);
+        }
+        break;
+      }
+    }
+    len = fp->_r;
+    p = fp->_p;
+
+    /*
+     * Scan through at most n bytes of the current buffer,
+     * looking for '\n'.  If found, copy up to and including
+     * newline, and stop.  Otherwise, copy entire chunk
+     * and loop.
+     */
+    if (len > (size_t)n)
+      len = n;
+    t = memchr((void *)p, '\n', len);
+    if (t != NULL) {
+      len = ++t - p;
+      fp->_r -= (int)len;
+      fp->_p = t;
+      (void)memcpy((void *)s, (void *)p, len);
+      s[len] = 0;
+      FUNLOCKFILE(fp);
+      return (buf);
+    }
+    fp->_r -= (int)len;
+    fp->_p += len;
+    (void)memcpy((void *)s, (void *)p, len);
+    s += len;
+    n -= (int)len;
+  }
+  *s = 0;
+  FUNLOCKFILE(fp);
+  return (buf);
+}

StdLib/LibC/Stdio/fgetstr.c

@@ -0,0 +1,169 @@
+/*  $NetBSD: fgetstr.c,v 1.4 2006/11/24 19:46:58 christos Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fgetline.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fgetstr.c,v 1.4 2006/11/24 19:46:58 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Expand the line buffer.  Return -1 on error.
+#ifdef notdef
+ * The `new size' does not account for a terminating '\0',
+ * so we add 1 here.
+#endif
+ */
+int
+__slbexpand(FILE *fp, size_t newsize)
+{
+  void *p;
+
+#ifdef notdef
+  ++newsize;
+#endif
+  _DIAGASSERT(fp != NULL);
+
+  if ((size_t)fp->_lb._size >= newsize)
+    return (0);
+  if ((p = realloc(fp->_lb._base, newsize)) == NULL)
+    return (-1);
+  fp->_lb._base = p;
+  fp->_lb._size = (int)newsize;
+  return (0);
+}
+
+/*
+ * Get an input line.  The returned pointer often (but not always)
+ * points into a stdio buffer.  Fgetline does not alter the text of
+ * the returned line (which is thus not a C string because it will
+ * not necessarily end with '\0'), but does allow callers to modify
+ * it if they wish.  Thus, we set __SMOD in case the caller does.
+ */
+char *
+__fgetstr(FILE *fp, size_t *lenp, int sep)
+{
+  unsigned char *p;
+  size_t len;
+  size_t off;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(lenp != NULL);
+
+  /* make sure there is input */
+  if (fp->_r <= 0 && __srefill(fp)) {
+    *lenp = 0;
+    return (NULL);
+  }
+
+  /* look for a newline in the input */
+  if ((p = memchr((void *)fp->_p, sep, (size_t)fp->_r)) != NULL) {
+    char *ret;
+
+    /*
+     * Found one.  Flag buffer as modified to keep fseek from
+     * `optimising' a backward seek, in case the user stomps on
+     * the text.
+     */
+    p++;    /* advance over it */
+    ret = (char *)fp->_p;
+    *lenp = len = p - fp->_p;
+    fp->_flags |= __SMOD;
+    fp->_r -= (int)len;
+    fp->_p = p;
+    return (ret);
+  }
+
+  /*
+   * We have to copy the current buffered data to the line buffer.
+   * As a bonus, though, we can leave off the __SMOD.
+   *
+   * OPTIMISTIC is length that we (optimistically) expect will
+   * accommodate the `rest' of the string, on each trip through the
+   * loop below.
+   */
+#define OPTIMISTIC 80
+
+  for (len = fp->_r, off = 0;; len += fp->_r) {
+    size_t diff;
+
+    /*
+     * Make sure there is room for more bytes.  Copy data from
+     * file buffer to line buffer, refill file and look for
+     * newline.  The loop stops only when we find a newline.
+     */
+    if (__slbexpand(fp, len + OPTIMISTIC))
+      goto error;
+    (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
+        len - off);
+    off = len;
+    if (__srefill(fp))
+      break;  /* EOF or error: return partial line */
+    if ((p = memchr((void *)fp->_p, sep, (size_t)fp->_r)) == NULL)
+      continue;
+
+    /* got it: finish up the line (like code above) */
+    p++;
+    diff = p - fp->_p;
+    len += diff;
+    if (__slbexpand(fp, len))
+      goto error;
+    (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
+        diff);
+    fp->_r -= (int)diff;
+    fp->_p = p;
+    break;
+  }
+  *lenp = len;
+#ifdef notdef
+  fp->_lb._base[len] = 0;
+#endif
+  return ((char *)fp->_lb._base);
+
+error:
+  *lenp = 0;    /* ??? */
+  return (NULL);    /* ??? */
+}

StdLib/LibC/Stdio/fgetwc.c

@@ -0,0 +1,100 @@
+/*-
+ * 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:
+ * 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.
+ *
+ * $Citrus$
+
+  NetBSD: fgetwc.c,v 1.5 2006/07/03 17:06:36 tnozaki Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <wchar.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+wint_t
+__fgetwc_unlock(FILE *fp)
+{
+  struct wchar_io_data *wcio;
+  mbstate_t *st;
+  wchar_t wc;
+  size_t size;
+
+  _DIAGASSERT(fp != NULL);
+
+  _SET_ORIENTATION(fp, 1);
+  wcio = WCIO_GET(fp);
+  if (wcio == 0) {
+    errno = ENOMEM;
+    return WEOF;
+  }
+
+  /* if there're ungetwc'ed wchars, use them */
+  if (wcio->wcio_ungetwc_inbuf) {
+    wc = wcio->wcio_ungetwc_buf[--wcio->wcio_ungetwc_inbuf];
+
+    return wc;
+  }
+
+  st = &wcio->wcio_mbstate_in;
+
+  do {
+    char c;
+    int ch = __sgetc(fp);
+
+    if (ch == EOF) {
+      return WEOF;
+    }
+
+    c = (char)ch;
+    size = mbrtowc(&wc, &c, 1, st);
+    if (size == (size_t)-1) {
+      errno = EILSEQ;
+      fp->_flags |= __SERR;
+      return WEOF;
+    }
+  } while (size == (size_t)-2);
+
+  _DIAGASSERT(size == 1);
+
+  return wc;
+}
+
+wint_t
+fgetwc(FILE *fp)
+{
+  wint_t r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __fgetwc_unlock(fp);
+  FUNLOCKFILE(fp);
+
+  return (r);
+}

StdLib/LibC/Stdio/fgetws.c

@@ -0,0 +1,92 @@
+/* $NetBSD: fgetws.c,v 1.2 2006/07/03 17:06:36 tnozaki 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.
+ *
+ * Original version ID:
+ * FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
+ *
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIB_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fgetws.c,v 1.2 2006/07/03 17:06:36 tnozaki Exp $");
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+
+wchar_t *
+fgetws(
+  wchar_t * __restrict ws,
+  int n,
+  FILE * __restrict fp
+  )
+{
+  wchar_t *wsp;
+  wint_t wc;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(ws != NULL);
+
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, 1);
+
+  if (n <= 0) {
+    errno = EINVAL;
+    goto error;
+  }
+
+  wsp = ws;
+  while (n-- > 1) {
+    wc = __fgetwc_unlock(fp);
+    if (__sferror(fp) != 0)
+      goto error;
+    if (__sfeof(fp) != 0) {
+      if (wsp == ws) {
+        /* EOF/error, no characters read yet. */
+        goto error;
+      }
+      break;
+    }
+    *wsp++ = (wchar_t)wc;
+    if (wc == L'\n') {
+      break;
+    }
+  }
+
+  *wsp++ = L'\0';
+  FUNLOCKFILE(fp);
+
+  return (ws);
+
+error:
+  FUNLOCKFILE(fp);
+  return (NULL);
+}

StdLib/LibC/Stdio/fileext.h

@@ -0,0 +1,66 @@
+/* $NetBSD: fileext.h,v 1.5 2003/07/18 21:46:41 nathanw 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+
+/*
+ * file extension
+ */
+struct __sfileext {
+	struct	__sbuf _ub; /* ungetc buffer */
+	struct wchar_io_data _wcio;	/* wide char i/o status */
+#ifdef _REENTRANT
+	mutex_t	_lock;	/* Lock for FLOCKFILE/FUNLOCKFILE */
+	cond_t _lockcond; /* Condition variable for signalling lock releases */
+	thr_t _lockowner; /* The thread currently holding the lock */
+	int _lockcount; /* Count of recursive locks */
+	int _lockinternal; /* Flag of whether the lock is held inside stdio */
+	int _lockcancelstate; /* Stashed cancellation state on internal lock */
+#endif	
+};
+
+#define _EXT(fp) ((struct __sfileext *)(void *)((fp)->_ext._base))
+#define _UB(fp) _EXT(fp)->_ub
+#ifdef _REENTRANT
+#define _LOCK(fp) (_EXT(fp)->_lock)
+#define _LOCKCOND(fp) (_EXT(fp)->_lockcond)
+#define _LOCKOWNER(fp) (_EXT(fp)->_lockowner)
+#define _LOCKCOUNT(fp) (_EXT(fp)->_lockcount)
+#define _LOCKINTERNAL(fp) (_EXT(fp)->_lockinternal)
+#define _LOCKCANCELSTATE(fp) (_EXT(fp)->_lockcancelstate)
+#define _FILEEXT_SETUP(f, fext) do { \
+	/* LINTED */(f)->_ext._base = (unsigned char *)(fext); \
+	mutex_init(&_LOCK(f), NULL); \
+	cond_init(&_LOCKCOND(f), 0, NULL); \
+	_LOCKOWNER(f) = NULL; \
+	_LOCKCOUNT(f) = 0; \
+	_LOCKINTERNAL(f) = 0; \
+	} while (/* LINTED */ 0)
+#else
+#define _FILEEXT_SETUP(f, fext) /* LINTED */(f)->_ext._base = (unsigned char *)(fext)
+#endif

StdLib/LibC/Stdio/fileno.c

@@ -0,0 +1,71 @@
+/*  $NetBSD: fileno.c,v 1.12 2004/05/09 17:27:53 kleink Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fileno.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fileno.c,v 1.12 2004/05/09 17:27:53 kleink Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * A subroutine version of the macro fileno.
+ */
+#undef fileno
+int _fileno __P((FILE *));  /* XXX */
+
+__weak_alias(fileno,_fileno)
+
+int
+_fileno(fp)
+  FILE *fp;
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sfileno(fp);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/findfp.c

@@ -0,0 +1,211 @@
+/*  $NetBSD: findfp.c,v 1.23 2006/10/07 21:40:46 thorpej Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)findfp.c  8.2 (Berkeley) 1/4/94";
+#else
+__RCSID("$NetBSD: findfp.c,v 1.23 2006/10/07 21:40:46 thorpej Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  "namespace.h"
+#include  <sys/param.h>
+#include  <sys/EfiSysCall.h>
+#include  <stdio.h>
+#include  <errno.h>
+#include  <stdlib.h>
+#include  <string.h>
+#include  "reentrant.h"
+#include  "local.h"
+#include  "glue.h"
+#include  <MainData.h>
+
+int __sdidinit;
+
+#define NDYNAMIC 10   /* add ten more whenever necessary */
+
+#define std(flags, file) \
+/*    p     r  w  flags  file  bf     lfbsize  cookie       close */ \
+  { NULL, 0, 0, flags, file, { NULL, 0 }, 0, __sF + file, __sclose, \
+/*    read      seek     write     ext                              up */ \
+    __sread,  __sseek, __swrite, { (void *)(__sFext + file), 0 }, NULL, \
+/*    ur ubuf,                 nbuf      lb     blksize  offset */ \
+    0, { '\0', '\0', '\0' }, { '\0' }, { NULL, 0 }, 0, (fpos_t)0 }
+
+        /* the usual - (stdin + stdout + stderr) */
+static FILE usual[FOPEN_MAX - 3];
+static struct __sfileext usualext[FOPEN_MAX - 3];
+static struct glue uglue = { 0, FOPEN_MAX - 3, usual };
+
+#if defined(_REENTRANT) && !defined(__lint__) /* XXX lint is busted */
+#define STDEXT { ._lock = MUTEX_INITIALIZER, ._lockcond = COND_INITIALIZER }
+struct __sfileext __sFext[3] = { STDEXT,
+         STDEXT,
+         STDEXT};
+#else
+struct __sfileext __sFext[3];
+#endif
+
+FILE __sF[3] = {
+  std(__SRD, STDIN_FILENO),   /* stdin */
+  std(__SWR, STDOUT_FILENO),    /* stdout */
+  std(__SWR|__SNBF, STDERR_FILENO)  /* stderr */
+};
+struct glue __sglue = { &uglue, 3, __sF };
+
+static struct glue *moreglue(int);
+void f_prealloc(void);
+
+#ifdef _REENTRANT
+rwlock_t __sfp_lock = RWLOCK_INITIALIZER;
+#endif
+
+static struct glue *
+moreglue(int n)
+{
+  struct glue *g;
+  FILE *p;
+  struct __sfileext *pext;
+  static FILE empty;
+
+  g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE)
+    + n * sizeof(struct __sfileext));
+  if (g == NULL)
+    return (NULL);
+  p = (FILE *)ALIGN((g + 1));
+  g->next = NULL;
+  g->niobs = n;
+  g->iobs = p;
+  pext = (void *)(p + n);
+  while (--n >= 0) {
+    *p = empty;
+    _FILEEXT_SETUP(p, pext);
+    p++;
+    pext++;
+  }
+  return (g);
+}
+
+/*
+ * Find a free FILE for fopen et al.
+ */
+FILE *
+__sfp()
+{
+  FILE *fp;
+  int n;
+  struct glue *g;
+
+  if (!__sdidinit)
+    __sinit();
+
+  rwlock_wrlock(&__sfp_lock);
+  for (g = &__sglue;; g = g->next) {
+    for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
+      if (fp->_flags == 0)
+        goto found;
+    if (g->next == NULL && (g->next = moreglue(NDYNAMIC)) == NULL)
+      break;
+  }
+  rwlock_unlock(&__sfp_lock);
+  return (NULL);
+found:
+  fp->_flags = 1;   /* reserve this slot; caller sets real flags */
+  fp->_p = NULL;    /* no current pointer */
+  fp->_w = 0;   /* nothing to read or write */
+  fp->_r = 0;
+  fp->_bf._base = NULL; /* no buffer */
+  fp->_bf._size = 0;
+  fp->_lbfsize = 0; /* not line buffered */
+  fp->_file = -1;   /* no file */
+/*  fp->_cookie = <any>; */ /* caller sets cookie, _read/_write etc */
+  _UB(fp)._base = NULL; /* no ungetc buffer */
+  _UB(fp)._size = 0;
+  fp->_lb._base = NULL; /* no line buffer */
+  fp->_lb._size = 0;
+  memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data));
+  rwlock_unlock(&__sfp_lock);
+  return (fp);
+}
+
+#if 0
+/*
+ * XXX.  Force immediate allocation of internal memory.  Not used by stdio,
+ * but documented historically for certain applications.  Bad applications.
+ */
+void
+f_prealloc()
+{
+  struct glue *g;
+  int n;
+
+  n = (int)sysconf(_SC_OPEN_MAX) - FOPEN_MAX + 20; /* 20 for slop. */
+  for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
+    /* void */;
+  if (n > 0)
+    g->next = moreglue(n);
+}
+#endif
+
+/*
+ * exit() calls _cleanup() through *gMD->cleanup, set whenever we
+ * open or buffer a file.  This chicanery is done so that programs
+ * that do not use stdio need not link it all in.
+ *
+ * The name `_cleanup' is, alas, fairly well known outside stdio.
+ */
+void
+_cleanup( void )
+{
+  /* (void) _fwalk(fclose); */
+  (void) fflush(NULL);      /* `cheating' */
+}
+
+/*
+ * __sinit() is called whenever stdio's internal variables must be set up.
+ */
+void
+__sinit( void )
+{
+  int i;
+
+  for (i = 0; i < FOPEN_MAX - 3; i++)
+    _FILEEXT_SETUP(&usual[i], &usualext[i]);
+
+  /* make sure we clean up on exit */
+  gMD->cleanup = _cleanup;   /* conservative */
+  __sdidinit = 1;
+}

StdLib/LibC/Stdio/flags.c

@@ -0,0 +1,115 @@
+/** @file
+    Implementation of internal function to return the (stdio) flags for a given mode.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: flags.c,v 1.14 2003/08/07 16:43:23 agc Exp
+    flags.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+
+#include <sys/types.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Return the (stdio) flags for a given mode.  Store the flags
+ * to be passed to an open() syscall through *optr.
+ * Return 0 on error.
+ */
+int
+__sflags(const char *mode, int *optr)
+{
+  int ret, m, o;
+
+  _DIAGASSERT(mode != NULL);
+
+  switch (*mode++) {
+
+    case 'r': /* open for reading */
+      ret = __SRD;
+      m = O_RDONLY;
+      o = 0;
+      break;
+
+    case 'w': /* open for writing */
+      ret = __SWR;
+      m = O_WRONLY;
+      o = O_CREAT | O_TRUNC;
+      break;
+
+    case 'a': /* open for appending */
+      ret = __SWR;
+      m = O_WRONLY;
+      o = O_CREAT | O_APPEND;
+      break;
+
+    default:  /* illegal mode */
+      errno = EINVAL;
+      return (0);
+  }
+
+  /*
+   * [rwa]\+ or [rwa]b\+ means read and write
+   * f means open only plain files.
+   */
+  for (; *mode; mode++)
+    switch (*mode) {
+    case '+':
+      ret = __SRW;
+      m = O_RDWR;
+      break;
+    case 'f':
+      o |= O_NONBLOCK;
+      break;
+    case 'b':
+      break;
+    default:  /* We could produce a warning here */
+      break;
+    }
+
+  *optr = m | o;
+  return (ret);
+}

StdLib/LibC/Stdio/floatio.h

@@ -0,0 +1,55 @@
+/*	$NetBSD: floatio.h,v 1.5 2005/05/14 23:51:02 christos Exp $	*/
+
+/*-
+ * 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. 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.
+ *
+ *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * Floating point scanf/printf (input/output) definitions.
+ */
+
+/* 11-bit exponent (VAX G floating point) is 308 decimal digits */
+#define	MAXEXP		308
+/* 128 bit fraction takes up 39 decimal digits; max reasonable precision */
+#define	MAXFRACT	39
+/*    
+ * MAXEXPDIG is the maximum number of decimal digits needed to store a
+ * floating point exponent in the largest supported format.  It should
+ * be ceil(log10(LDBL_MAX_10_EXP)) or, if hexadecimal floating point 
+ * conversions are supported, ceil(log10(LDBL_MAX_EXP)).  But since it
+ * is presently never greater than 5 in practice, we fudge it.
+ */   
+#define MAXEXPDIG       6
+#if LDBL_MAX_EXP > 999999
+#error "floating point buffers too small"
+#endif 

StdLib/LibC/Stdio/flockfile.c

@@ -0,0 +1,192 @@
+/*  $NetBSD: flockfile.c,v 1.8 2003/07/22 00:56:25 nathanw Exp $  */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nathan J. Williams.
+ *
+ * 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 NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: flockfile.c,v 1.8 2003/07/22 00:56:25 nathanw Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(flockfile,_flockfile)
+__weak_alias(ftrylockfile,_ftrylockfile)
+__weak_alias(funlockfile,_funlockfile)
+#endif
+
+#ifdef _REENTRANT
+/*
+ * XXX This code makes the assumption that a thr_t (pthread_t) is a
+ * XXX pointer.
+ */
+
+extern int __isthreaded;
+
+void
+flockfile(FILE *fp)
+{
+
+  __flockfile_internal(fp, 0);
+}
+
+int
+ftrylockfile(FILE *fp)
+{
+  int retval;
+
+  if (__isthreaded == 0)
+    return 0;
+
+  retval = 0;
+  mutex_lock(&_LOCK(fp));
+
+  if (_LOCKOWNER(fp) == thr_self()) {
+    _LOCKCOUNT(fp)++;
+  } else if (_LOCKOWNER(fp) == NULL) {
+    _LOCKOWNER(fp) = thr_self();
+    _LOCKCOUNT(fp) = 1;
+  } else
+    retval = -1;
+
+  mutex_unlock(&_LOCK(fp));
+
+  return retval;
+}
+
+void
+funlockfile(FILE *fp)
+{
+
+  __funlockfile_internal(fp, 0);
+}
+
+void
+__flockfile_internal(FILE *fp, int internal)
+{
+
+  if (__isthreaded == 0)
+    return;
+
+  mutex_lock(&_LOCK(fp));
+
+  if (_LOCKOWNER(fp) == thr_self()) {
+    _LOCKCOUNT(fp)++;
+    if (internal)
+      _LOCKINTERNAL(fp)++;
+  } else {
+    /* danger! cond_wait() is a cancellation point. */
+    int oldstate;
+    thr_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
+    while (_LOCKOWNER(fp) != NULL)
+      cond_wait(&_LOCKCOND(fp), &_LOCK(fp));
+    thr_setcancelstate(oldstate, NULL);
+    _LOCKOWNER(fp) = thr_self();
+    _LOCKCOUNT(fp) = 1;
+    if (internal)
+      _LOCKINTERNAL(fp) = 1;
+  }
+
+  if (_LOCKINTERNAL(fp) == 1)
+    /* stash cancellation state and disable */
+    thr_setcancelstate(PTHREAD_CANCEL_DISABLE,
+        &_LOCKCANCELSTATE(fp));
+
+  mutex_unlock(&_LOCK(fp));
+}
+
+void
+__funlockfile_internal(FILE *fp, int internal)
+{
+
+  if (__isthreaded == 0)
+    return;
+
+  mutex_lock(&_LOCK(fp));
+
+  if (internal) {
+    _LOCKINTERNAL(fp)--;
+    if (_LOCKINTERNAL(fp) == 0)
+      thr_setcancelstate(_LOCKCANCELSTATE(fp), NULL);
+  }
+
+  _LOCKCOUNT(fp)--;
+  if (_LOCKCOUNT(fp) == 0) {
+    _LOCKOWNER(fp) = NULL;
+    cond_signal(&_LOCKCOND(fp));
+  }
+
+  mutex_unlock(&_LOCK(fp));
+}
+
+#else /* _REENTRANT */
+
+void
+flockfile(FILE *fp)
+{
+  /* LINTED deliberate lack of effect */
+  (void)fp;
+
+  return;
+}
+
+int
+ftrylockfile(FILE *fp)
+{
+  /* LINTED deliberate lack of effect */
+  (void)fp;
+
+  return (0);
+}
+
+void
+funlockfile(FILE *fp)
+{
+  /* LINTED deliberate lack of effect */
+  (void)fp;
+
+  return;
+}
+
+#endif /* _REENTRANT */

StdLib/LibC/Stdio/fopen.c

@@ -0,0 +1,109 @@
+/** @file
+    Implementation of fopen as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fopen.c,v 1.12 2003/08/07 16:43:24 agc Exp
+    fopen.c 8.1 (Berkeley) 6/4/93"
+**/
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <sys/types.h>
+#include  <sys/stat.h>
+#include  <assert.h>
+#include  <fcntl.h>
+#include  <sys/EfiSysCall.h>
+#include  <stdio.h>
+#include  <errno.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+FILE *
+fopen(const char *file, const char *mode)
+{
+  FILE *fp;
+  int f;
+  int flags, oflags;
+
+  _DIAGASSERT(file != NULL);
+  if ((flags = __sflags(mode, &oflags)) == 0)
+    return (NULL);
+  if ((fp = __sfp()) == NULL)
+    return (NULL);
+  if ((f = open(file, oflags, DEFFILEMODE)) < 0)
+    goto release;
+  if (oflags & O_NONBLOCK) {
+    struct stat st;
+    if (fstat(f, &st) == -1) {
+      int sverrno = errno;
+      (void)close(f);
+      errno = sverrno;
+      goto release;
+    }
+    if (!S_ISREG(st.st_mode)) {
+      (void)close(f);
+      errno = EFTYPE;
+      goto release;
+    }
+  }
+  fp->_file = (short)f;
+  fp->_flags = (unsigned short)flags;
+  fp->_cookie = fp;
+  fp->_read = __sread;
+  fp->_write = __swrite;
+  fp->_seek = __sseek;
+  fp->_close = __sclose;
+
+  /*
+   * When opening in append mode, even though we use O_APPEND,
+   * we need to seek to the end so that ftell() gets the right
+   * answer.  If the user then alters the seek pointer, or
+   * the file extends, this will fail, but there is not much
+   * we can do about this.  (We could set __SAPP and check in
+   * fseek and ftell.)
+   */
+  if (oflags & O_APPEND)
+    (void) __sseek((void *)fp, (fpos_t)0, SEEK_END);
+  return (fp);
+release:
+  fp->_flags = 0;     /* release */
+  return (NULL);
+}

StdLib/LibC/Stdio/fparseln.c

@@ -0,0 +1,248 @@
+/*  $NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $ */
+
+/*
+ * Copyright (c) 1997 Christos Zoulas.  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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by Christos Zoulas.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef __weak_alias
+__weak_alias(fparseln,_fparseln)
+#endif
+
+#if ! HAVE_FPARSELN
+
+#ifndef HAVE_NBTOOL_CONFIG_H
+#include "reentrant.h"
+#include "local.h"
+#else
+#define FLOCKFILE(fp)
+#define FUNLOCKFILE(fp)
+#endif
+
+#if defined(_REENTRANT) && !HAVE_NBTOOL_CONFIG_H
+#define __fgetln(f, l) __fgetstr(f, l, '\n')
+#else
+#define __fgetln(f, l) fgetln(f, l)
+#endif
+
+static int isescaped(const char *, const char *, int);
+
+/* isescaped():
+ *  Return true if the character in *p that belongs to a string
+ *  that starts in *sp, is escaped by the escape character esc.
+ */
+static int
+isescaped(const char *sp, const char *p, int esc)
+{
+  const char     *cp;
+  size_t    ne;
+
+  _DIAGASSERT(sp != NULL);
+  _DIAGASSERT(p != NULL);
+
+  /* No escape character */
+  if (esc == '\0')
+    return 1;
+
+  /* Count the number of escape characters that precede ours */
+  for (ne = 0, cp = p; --cp >= sp && *cp == esc; ne++)
+    continue;
+
+  /* Return true if odd number of escape characters */
+  return (ne & 1) != 0;
+}
+
+
+/* fparseln():
+ *  Read a line from a file parsing continuations ending in \
+ *  and eliminating trailing newlines, or comments starting with
+ *  the comment char.
+ */
+char *
+fparseln(FILE *fp, size_t *size, size_t *lineno, const char str[3], int flags)
+{
+  static const char dstr[3] = { '\\', '\\', '#' };
+
+  size_t  s, len;
+  char   *buf;
+  char   *ptr, *cp;
+  int cnt;
+  char  esc, con, nl, com;
+
+  _DIAGASSERT(fp != NULL);
+
+  len = 0;
+  buf = NULL;
+  cnt = 1;
+
+  if (str == NULL)
+    str = dstr;
+
+  esc = str[0];
+  con = str[1];
+  com = str[2];
+  /*
+   * XXX: it would be cool to be able to specify the newline character,
+   * but unfortunately, fgetln does not let us
+   */
+  nl  = '\n';
+
+  FLOCKFILE(fp);
+
+  while (cnt) {
+    cnt = 0;
+
+    if (lineno)
+      (*lineno)++;
+
+    if ((ptr = __fgetln(fp, &s)) == NULL)
+      break;
+
+    if (s && com) {   /* Check and eliminate comments */
+      for (cp = ptr; cp < ptr + s; cp++)
+        if (*cp == com && !isescaped(ptr, cp, esc)) {
+          s = cp - ptr;
+          cnt = s == 0 && buf == NULL;
+          break;
+        }
+    }
+
+    if (s && nl) {    /* Check and eliminate newlines */
+      cp = &ptr[s - 1];
+
+      if (*cp == nl)
+        s--;  /* forget newline */
+    }
+
+    if (s && con) {   /* Check and eliminate continuations */
+      cp = &ptr[s - 1];
+
+      if (*cp == con && !isescaped(ptr, cp, esc)) {
+        s--;  /* forget escape */
+        cnt = 1;
+      }
+    }
+
+    if (s == 0 && buf != NULL)
+      continue;
+
+    if ((cp = realloc(buf, len + s + 1)) == NULL) {
+      FUNLOCKFILE(fp);
+      free(buf);
+      return NULL;
+    }
+    buf = cp;
+
+    (void) memcpy(buf + len, ptr, s);
+    len += s;
+    buf[len] = '\0';
+  }
+
+  FUNLOCKFILE(fp);
+
+  if ((flags & FPARSELN_UNESCALL) != 0 && esc && buf != NULL &&
+      strchr(buf, esc) != NULL) {
+    ptr = cp = buf;
+    while (cp[0] != '\0') {
+      int skipesc;
+
+      while (cp[0] != '\0' && cp[0] != esc)
+        *ptr++ = *cp++;
+      if (cp[0] == '\0' || cp[1] == '\0')
+        break;
+
+      skipesc = 0;
+      if (cp[1] == com)
+        skipesc += (flags & FPARSELN_UNESCCOMM);
+      if (cp[1] == con)
+        skipesc += (flags & FPARSELN_UNESCCONT);
+      if (cp[1] == esc)
+        skipesc += (flags & FPARSELN_UNESCESC);
+      if (cp[1] != com && cp[1] != con && cp[1] != esc)
+        skipesc = (flags & FPARSELN_UNESCREST);
+
+      if (skipesc)
+        cp++;
+      else
+        *ptr++ = *cp++;
+      *ptr++ = *cp++;
+    }
+    *ptr = '\0';
+    len = strlen(buf);
+  }
+
+  if (size)
+    *size = len;
+  return buf;
+}
+
+#ifdef TEST
+
+int main(int, char **);
+
+int
+main(int argc, char **argv)
+{
+  char   *ptr;
+  size_t  size, line;
+
+  line = 0;
+  while ((ptr = fparseln(stdin, &size, &line, NULL,
+      FPARSELN_UNESCALL)) != NULL)
+    printf("line %d (%d) |%s|\n", line, size, ptr);
+  return 0;
+}
+
+/*
+
+# This is a test
+line 1
+line 2 \
+line 3 # Comment
+line 4 \# Not comment \\\\
+
+# And a comment \
+line 5 \\\
+line 6
+
+*/
+
+#endif /* TEST */
+#endif  /* ! HAVE_FPARSELN */

StdLib/LibC/Stdio/fprintf.c

@@ -0,0 +1,66 @@
+/** @file
+    Implementation of fprintf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fprintf.c,v 1.11 2003/08/07 16:43:24 agc Exp
+    fprintf.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+int
+fprintf(FILE *fp, const char *fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  va_start(ap, fmt);
+  ret = vfprintf(fp, fmt, ap);
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/fpurge.c

@@ -0,0 +1,76 @@
+/*  $NetBSD: fpurge.c,v 1.13 2003/08/07 16:43:24 agc Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fpurge.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fpurge.c,v 1.13 2003/08/07 16:43:24 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * fpurge: like fflush, but without writing anything: leave the
+ * given FILE's buffer empty.
+ */
+int
+fpurge(fp)
+  FILE *fp;
+{
+
+  _DIAGASSERT(fp != NULL);
+
+  if (fp->_flags == 0) {
+    errno = EBADF;
+    return (EOF);
+  }
+  FLOCKFILE(fp);
+  if (HASUB(fp))
+    FREEUB(fp);
+  WCIO_FREE(fp);
+  fp->_p = fp->_bf._base;
+  fp->_r = 0;
+  fp->_w = fp->_flags & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
+  FUNLOCKFILE(fp);
+  return (0);
+}

StdLib/LibC/Stdio/fputc.c

@@ -0,0 +1,65 @@
+/** @file
+    Implementation of fputc as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fputc.c,v 1.12 2003/08/07 16:43:24 agc Exp
+    fputc.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+fputc(int c, FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sputc(c, fp);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/fputs.c

@@ -0,0 +1,81 @@
+/** @file
+    Implementation of fputs as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fputs.c,v 1.14 2005/06/22 19:45:22 christos Exp
+    fputs.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+#include "fvwrite.h"
+
+/*
+ * Write the given string to the given file.
+ */
+int
+fputs(const char *s, FILE *fp)
+{
+  struct __suio uio;
+  struct __siov iov;
+  int r;
+
+  _DIAGASSERT(s != NULL);
+  _DIAGASSERT(fp != NULL);
+
+  if (s == NULL)
+    s = "(null)";
+
+  iov.iov_base = __UNCONST(s);
+  uio.uio_resid = (int)(iov.iov_len = strlen(s));
+  uio.uio_iov = &iov;
+  uio.uio_iovcnt = 1;
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, -1);
+  r = __sfvwrite(fp, &uio);
+  FUNLOCKFILE(fp);
+  return r;
+}

StdLib/LibC/Stdio/fputwc.c

@@ -0,0 +1,100 @@
+/* $NetBSD: fputwc.c,v 1.4 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fputwc.c,v 1.4 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+#include "fvwrite.h"
+
+wint_t
+__fputwc_unlock(wchar_t wc, FILE *fp)
+{
+  struct wchar_io_data *wcio;
+  mbstate_t *st;
+  size_t size;
+  char buf[MB_LEN_MAX];
+  struct __suio uio;
+  struct __siov iov;
+
+  _DIAGASSERT(fp != NULL);
+
+  /* LINTED we don't play with buf */
+  iov.iov_base = (void *)buf;
+  uio.uio_iov = &iov;
+  uio.uio_iovcnt = 1;
+
+  _SET_ORIENTATION(fp, 1);
+  wcio = WCIO_GET(fp);
+  if (wcio == 0) {
+    errno = ENOMEM;
+    return WEOF;
+  }
+
+  wcio->wcio_ungetwc_inbuf = 0;
+  st = &wcio->wcio_mbstate_out;
+
+  size = wcrtomb(buf, wc, st);
+  if (size == (size_t)-1) {
+    errno = EILSEQ;
+    return WEOF;
+  }
+
+  _DIAGASSERT(size != 0);
+
+  uio.uio_resid = (int)(iov.iov_len = size);
+  if (__sfvwrite(fp, &uio)) {
+    return WEOF;
+  }
+
+  return (wint_t)wc;
+}
+
+wint_t
+fputwc(wchar_t wc, FILE *fp)
+{
+  wint_t r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __fputwc_unlock(wc, fp);
+  FUNLOCKFILE(fp);
+
+  return (r);
+}

StdLib/LibC/Stdio/fputws.c

@@ -0,0 +1,65 @@
+/* $NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak 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.
+ *
+ * Original version ID:
+ * FreeBSD: src/lib/libc/stdio/fputws.c,v 1.4 2002/09/20 13:25:40 tjr Exp
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fputws.c,v 1.1 2003/03/07 07:11:37 tshiozak Exp $");
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+fputws(
+  const wchar_t * __restrict ws,
+  FILE * __restrict fp
+  )
+{
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(ws != NULL);
+
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, 1);
+
+  while (*ws != '\0') {
+    if (__fputwc_unlock(*ws++, fp) == WEOF) {
+      FUNLOCKFILE(fp);
+      return (-1);
+    }
+  }
+  FUNLOCKFILE(fp);
+
+  return (0);
+}

StdLib/LibC/Stdio/fread.c

@@ -0,0 +1,96 @@
+/** @file
+    Implementation of fread as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fread.c,v 1.16 2003/08/07 16:43:25 agc Exp
+    fread.c 8.2 (Berkeley) 12/11/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+size_t
+fread(void *buf, size_t size, size_t count, FILE *fp)
+{
+  size_t resid;
+  char *p;
+  int r;
+  size_t total;
+
+  _DIAGASSERT(fp != NULL);
+  /*
+   * The ANSI standard requires a return value of 0 for a count
+   * or a size of 0.  Whilst ANSI imposes no such requirements on
+   * fwrite, the SUSv2 does.
+   */
+  if ((resid = count * size) == 0)
+    return (0);
+
+  _DIAGASSERT(buf != NULL);
+
+  FLOCKFILE(fp);
+  if (fp->_r < 0)
+    fp->_r = 0;
+  total = resid;
+  p = buf;
+  while (resid > (size_t)(r = fp->_r)) {
+    (void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
+    fp->_p += r;
+    /* fp->_r = 0 ... done in __srefill */
+    p += r;
+    resid -= r;
+    if (__srefill(fp)) {
+      /* no more input: return partial result */
+      FUNLOCKFILE(fp);
+      return ((total - resid) / size);
+    }
+  }
+  (void)memcpy((void *)p, (void *)fp->_p, resid);
+  fp->_r -= (int)resid;
+  fp->_p += resid;
+  FUNLOCKFILE(fp);
+  return (count);
+}

StdLib/LibC/Stdio/freopen.c

@@ -0,0 +1,196 @@
+/** @file
+    Implementation of freopen as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: freopen.c,v 1.14 2003/08/07 16:43:25 agc Exp
+    freopen.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <sys/types.h>
+#include  <sys/stat.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <fcntl.h>
+#include  <sys/EfiSysCall.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <wchar.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+/*
+ * Re-direct an existing, open (probably) file to some other file.
+ * ANSI is written such that the original file gets closed if at
+ * all possible, no matter what.
+ */
+FILE *
+freopen(const char *file, const char *mode, FILE *fp)
+{
+  int f;
+  int flags, isopen, oflags, sverrno, wantfd;
+
+  _DIAGASSERT(file != NULL);
+  _DIAGASSERT(mode != NULL);
+  _DIAGASSERT(fp != NULL);
+
+  if ((flags = __sflags(mode, &oflags)) == 0) {
+    (void) fclose(fp);
+    return (NULL);
+  }
+
+  if (!__sdidinit)
+    __sinit();
+
+  /*
+   * There are actually programs that depend on being able to "freopen"
+   * descriptors that weren't originally open.  Keep this from breaking.
+   * Remember whether the stream was open to begin with, and which file
+   * descriptor (if any) was associated with it.  If it was attached to
+   * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin)
+   * should work.  This is unnecessary if it was not a Unix file.
+   */
+  if (fp->_flags == 0) {
+    fp->_flags = __SEOF;  /* hold on to it */
+    isopen = 0;
+    wantfd = -1;
+  } else {
+    /* flush the stream; ANSI doesn't require this. */
+    if (fp->_flags & __SWR)
+      (void) __sflush(fp);
+    /* if close is NULL, closing is a no-op, hence pointless */
+    isopen = fp->_close != NULL;
+    if ((wantfd = fp->_file) < 0 && isopen) {
+      (void) (*fp->_close)(fp->_cookie);
+      isopen = 0;
+    }
+  }
+
+  /* Get a new descriptor to refer to the new file. */
+  f = open(file, oflags, DEFFILEMODE);
+  if (f < 0 && isopen) {
+    /* If out of fd's close the old one and try again. */
+    if (errno == ENFILE || errno == EMFILE) {
+      (void) (*fp->_close)(fp->_cookie);
+      isopen = 0;
+      f = open(file, oflags, DEFFILEMODE);
+    }
+  }
+  sverrno = errno;
+
+  /*
+   * Finish closing fp.  Even if the open succeeded above, we cannot
+   * keep fp->_base: it may be the wrong size.  This loses the effect
+   * of any setbuffer calls, but stdio has always done this before.
+   */
+  if (isopen && f != wantfd)
+    (void) (*fp->_close)(fp->_cookie);
+  if (fp->_flags & __SMBF)
+    free((char *)fp->_bf._base);
+  fp->_w = 0;
+  fp->_r = 0;
+  fp->_p = NULL;
+  fp->_bf._base = NULL;
+  fp->_bf._size = 0;
+  fp->_lbfsize = 0;
+  if (HASUB(fp))
+    FREEUB(fp);
+  WCIO_FREE(fp);
+  _UB(fp)._size = 0;
+  if (HASLB(fp))
+    FREELB(fp);
+  fp->_lb._size = 0;
+
+  if (f < 0) {      /* did not get it after all */
+    fp->_flags = 0;   /* set it free */
+    errno = sverrno;  /* restore in case _close clobbered */
+    return (NULL);
+  }
+
+  if (oflags & O_NONBLOCK) {
+    struct stat st;
+    if (fstat(f, &st) == -1) {
+      sverrno = errno;
+      (void)close(f);
+      errno = sverrno;
+      return (NULL);
+    }
+    if (!S_ISREG(st.st_mode)) {
+      (void)close(f);
+      errno = EFTYPE;
+      return (NULL);
+    }
+  }
+
+  /*
+   * If reopening something that was open before on a real file, try
+   * to maintain the descriptor.  Various C library routines (perror)
+   * assume stderr is always fd STDERR_FILENO, even if being freopen'd.
+   */
+  if (wantfd >= 0 && f != wantfd) {
+    if (dup2(f, wantfd) >= 0) {
+      (void) close(f);
+      f = wantfd;
+    }
+  }
+
+  fp->_flags = (unsigned short)flags;
+  fp->_file = (short)f;
+  fp->_cookie = fp;
+  fp->_read = __sread;
+  fp->_write = __swrite;
+  fp->_seek = __sseek;
+  fp->_close = __sclose;
+
+  /*
+   * When reopening in append mode, even though we use O_APPEND,
+   * we need to seek to the end so that ftell() gets the right
+   * answer.  If the user then alters the seek pointer, or
+   * the file extends, this will fail, but there is not much
+   * we can do about this.  (We could set __SAPP and check in
+   * fseek and ftell.)
+   */
+  if (oflags & O_APPEND)
+    (void) __sseek((void *)fp, (fpos_t)0, SEEK_END);
+  return (fp);
+}

StdLib/LibC/Stdio/fscanf.c

@@ -0,0 +1,66 @@
+/** @file
+    Implementation of fscanf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fscanf.c,v 1.12 2003/08/07 16:43:25 agc Exp
+    fscanf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+int
+fscanf(FILE *fp, char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  va_start(ap, fmt);
+  ret = __svfscanf(fp, fmt, ap);
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/fseek.c

@@ -0,0 +1,74 @@
+/** @file
+    Implementation of fseek as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    Copyright (c) 1990, 1993
+    The Regents of the University of California.  All rights reserved.
+
+    This code is derived from software contributed to The NetBSD Foundation
+    by David Laight.
+
+    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
+        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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fseek.c,v 1.22 2006/01/26 10:48:18 kleink Exp
+**/
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Seek the given file to the given offset.
+ * Zero extend the offset if SEEK_SET to allow access to 4GB files
+ */
+int
+fseek(FILE *fp, long l_offset, int whence)
+{
+  off_t offset;
+
+  if (whence == SEEK_SET)
+    offset = (off_t)((UINT64)l_offset);   // Coerce to unsigned to prevent sign extension
+  else
+    offset = (off_t)l_offset;                  // OK for this one to be negative
+  return fseeko(fp, offset, whence);
+}

StdLib/LibC/Stdio/fseeko.c

@@ -0,0 +1,290 @@
+/*  $NetBSD: fseeko.c,v 1.5 2005/03/04 16:04:58 dsl Exp $ */
+
+/*-
+ * 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. 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 <Uefi.h>               // REMOVE, For DEBUG only
+//#include <Library/UefiLib.h>    // REMOVE, For DEBUG only
+
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fseeko.c,v 1.5 2005/03/04 16:04:58 dsl Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(fseeko, _fseeko)
+#endif
+
+#define POS_ERR (-(fpos_t)1)
+
+/*
+ * Seek the given file to the given offset.
+ * `Whence' must be one of the three SEEK_* macros.
+ */
+int
+fseeko(FILE *fp, off_t offset, int whence)
+{
+  fpos_t (*seekfn)(void *, fpos_t, int);
+  fpos_t target, curoff;
+  size_t n;
+  struct stat st;
+  int havepos;
+
+  _DIAGASSERT(fp != NULL);
+
+#ifdef __GNUC__
+  /* This outrageous construct just to shut up a GCC warning. */
+  (void) &curoff;
+#endif
+
+  /* make sure stdio is set up */
+  if (!__sdidinit)
+    __sinit();
+
+//Print(L"%a( %d, %Ld, %d)\n", __func__, fp->_file, offset, whence);
+  FLOCKFILE(fp);
+
+  /*
+   * Have to be able to seek.
+   */
+  if ((seekfn = fp->_seek) == NULL) {
+    errno = ESPIPE;     /* historic practice */
+    FUNLOCKFILE(fp);
+//Print(L"%a: %d\n", __func__, __LINE__);
+    return (-1);
+  }
+
+  /*
+   * Change any SEEK_CUR to SEEK_SET, and check `whence' argument.
+   * After this, whence is either SEEK_SET or SEEK_END.
+   */
+  switch (whence) {
+
+  case SEEK_CUR:
+    /*
+     * In order to seek relative to the current stream offset,
+     * we have to first find the current stream offset a la
+     * ftell (see ftell for details).
+     */
+    __sflush(fp); /* may adjust seek offset on append stream */
+    if (fp->_flags & __SOFF)
+      curoff = fp->_offset;
+    else {
+      curoff = (*seekfn)(fp->_cookie, (fpos_t)0, SEEK_CUR);
+      if (curoff == POS_ERR) {
+        FUNLOCKFILE(fp);
+//Print(L"%a: %d\n", __func__, __LINE__);
+        return (-1);
+      }
+    }
+    if (fp->_flags & __SRD) {
+      curoff -= fp->_r;
+      if (HASUB(fp))
+        curoff -= fp->_ur;
+    } else if (fp->_flags & __SWR && fp->_p != NULL)
+      curoff += fp->_p - fp->_bf._base;
+
+    offset += curoff;
+    whence = SEEK_SET;
+    havepos = 1;
+    break;
+
+  case SEEK_SET:
+  case SEEK_END:
+    curoff = 0;   /* XXX just to keep gcc quiet */
+    havepos = 0;
+    break;
+
+  default:
+    errno = EINVAL;
+    FUNLOCKFILE(fp);
+//Print(L"%a: %d\n", __func__, __LINE__);
+    return (-1);
+  }
+
+  /*
+   * Can only optimise if:
+   *  reading (and not reading-and-writing);
+   *  not unbuffered; and
+   *  this is a `regular' Unix file (and hence seekfn==__sseek).
+   * We must check __NBF first, because it is possible to have __NBF
+   * and __SOPT both set.
+   */
+  if (fp->_bf._base == NULL)
+    __smakebuf(fp);
+  if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
+    goto dumb;
+  if ((fp->_flags & __SOPT) == 0) {
+    if (seekfn != __sseek ||
+        fp->_file < 0 || fstat(fp->_file, &st) ||
+        !S_ISREG(st.st_mode)) {
+      fp->_flags |= __SNPT;
+      goto dumb;
+    }
+    fp->_blksize = st.st_blksize;
+    fp->_flags |= __SOPT;
+  }
+
+  /*
+   * We are reading; we can try to optimise.
+   * Figure out where we are going and where we are now.
+   */
+  if (whence == SEEK_SET)
+    target = offset;
+  else {
+    if (fstat(fp->_file, &st))
+    {
+//Print(L"%a: %d\n", __func__, __LINE__);
+      goto dumb;
+    }
+    target = st.st_size + offset;
+  }
+
+  if (!havepos) {
+    if (fp->_flags & __SOFF)
+      curoff = fp->_offset;
+    else {
+      curoff = (*seekfn)(fp->_cookie, (fpos_t)0, SEEK_CUR);
+      if (curoff == POS_ERR)
+      {
+//Print(L"%a: %d\n", __func__, __LINE__);
+        goto dumb;
+      }
+    }
+    curoff -= fp->_r;
+    if (HASUB(fp))
+      curoff -= fp->_ur;
+  }
+
+  /*
+   * Compute the number of bytes in the input buffer (pretending
+   * that any ungetc() input has been discarded).  Adjust current
+   * offset backwards by this count so that it represents the
+   * file offset for the first byte in the current input buffer.
+   */
+  if (HASUB(fp)) {
+    curoff += fp->_r; /* kill off ungetc */
+    n = fp->_up - fp->_bf._base;
+    curoff -= n;
+    n += fp->_ur;
+  } else {
+    n = fp->_p - fp->_bf._base;
+    curoff -= n;
+    n += fp->_r;
+  }
+
+  /*
+   * If the target offset is within the current buffer,
+   * simply adjust the pointers, clear EOF, undo ungetc(),
+   * and return.  (If the buffer was modified, we have to
+   * skip this; see fgetln.c.)
+   */
+  if ((fp->_flags & __SMOD) == 0 &&
+      target >= curoff && target < (fpos_t)(curoff + n)) {
+    int o = (int)(target - curoff);
+
+    fp->_p = fp->_bf._base + o;
+    fp->_r = (int)(n - o);
+    if (HASUB(fp))
+      FREEUB(fp);
+    fp->_flags &= ~__SEOF;
+    FUNLOCKFILE(fp);
+    return (0);
+  }
+
+  /*
+   * The place we want to get to is not within the current buffer,
+   * but we can still be kind to the kernel copyout mechanism.
+   * By aligning the file offset to a block boundary, we can let
+   * the kernel use the VM hardware to map pages instead of
+   * copying bytes laboriously.  Using a block boundary also
+   * ensures that we only read one block, rather than two.
+   */
+  curoff = target & ~(fp->_blksize - 1);
+  if ((*seekfn)(fp->_cookie, curoff, SEEK_SET) == POS_ERR)
+  {
+//Print(L"%a: %d\n", __func__, __LINE__);
+    goto dumb;
+  }
+  fp->_r = 0;
+  fp->_p = fp->_bf._base;
+  if (HASUB(fp))
+    FREEUB(fp);
+  fp->_flags &= ~__SEOF;
+  n = (int)(target - curoff);
+  if (n) {
+    if (__srefill(fp) || fp->_r < (int)n)
+    {
+//Print(L"%a: %d\n", __func__, __LINE__);
+      goto dumb;
+    }
+    fp->_p += n;
+    fp->_r -= (int)n;
+  }
+  FUNLOCKFILE(fp);
+  return (0);
+
+  /*
+   * We get here if we cannot optimise the seek ... just
+   * do it.  Allow the seek function to change fp->_bf._base.
+   */
+dumb:
+//Print(L"%a: %d\n", __func__, __LINE__);
+  if (__sflush(fp) ||
+      (*seekfn)(fp->_cookie, (fpos_t)offset, whence) == POS_ERR) {
+    FUNLOCKFILE(fp);
+//Print(L"%a: %d\n", __func__, __LINE__);
+    return (-1);
+  }
+  /* success: clear EOF indicator and discard ungetc() data */
+  if (HASUB(fp))
+    FREEUB(fp);
+  fp->_p = fp->_bf._base;
+  fp->_r = 0;
+  /* fp->_w = 0; */ /* unnecessary (I think...) */
+  fp->_flags &= ~__SEOF;
+  FUNLOCKFILE(fp);
+//Print(L"%a: %d\n", __func__, __LINE__);
+  return (0);
+}

StdLib/LibC/Stdio/fsetpos.c

@@ -0,0 +1,63 @@
+/** @file
+    Implementation of fsetpos as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fsetpos.c,v 1.10 2003/08/07 16:43:25 agc Exp
+    fsetpos.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+/*
+ * fsetpos: like fseek.
+ */
+int
+fsetpos(FILE *iop, const fpos_t *pos)
+{
+  _DIAGASSERT(iop != NULL);
+  _DIAGASSERT(pos != NULL);
+
+  return (fseeko(iop, (off_t)*pos, SEEK_SET));
+}

StdLib/LibC/Stdio/ftell.c

@@ -0,0 +1,103 @@
+/** @file
+    Implementation of ftell as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: ftell.c,v 1.15 2003/08/07 16:43:25 agc Exp
+    ftell.c 8.2 (Berkeley) 5/4/95
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * ftell: return current offset.
+ */
+long
+ftell(FILE *fp)
+{
+  fpos_t pos;
+
+  FLOCKFILE(fp);
+
+  if (fp->_seek == NULL) {
+    FUNLOCKFILE(fp);
+    errno = ESPIPE;     /* historic practice */
+    return (-1L);
+  }
+
+  /*
+   * Find offset of underlying I/O object, then
+   * adjust for buffered bytes.
+   */
+  __sflush(fp);   /* may adjust seek offset on append stream */
+  if (fp->_flags & __SOFF)
+    pos = fp->_offset;
+  else {
+    pos = (*fp->_seek)(fp->_cookie, (fpos_t)0, SEEK_CUR);
+    if (pos == -1L) {
+      FUNLOCKFILE(fp);
+      return (long)(pos);
+    }
+  }
+  if (fp->_flags & __SRD) {
+    /*
+     * Reading.  Any unread characters (including
+     * those from ungetc) cause the position to be
+     * smaller than that in the underlying object.
+     */
+    pos -= fp->_r;
+    if (HASUB(fp))
+      pos -= fp->_ur;
+  } else if (fp->_flags & __SWR && fp->_p != NULL) {
+    /*
+     * Writing.  Any buffered characters cause the
+     * position to be greater than that in the
+     * underlying object.
+     */
+    pos += fp->_p - fp->_bf._base;
+  }
+  FUNLOCKFILE(fp);
+  return (long)(pos);
+}

StdLib/LibC/Stdio/ftello.c

@@ -0,0 +1,100 @@
+/*  $NetBSD: ftello.c,v 1.4 2003/08/07 16:43:26 agc Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: ftello.c,v 1.4 2003/08/07 16:43:26 agc Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(ftello, _ftello)
+#endif
+
+/*
+ * ftell: return current offset.
+ */
+off_t
+ftello(FILE *fp)
+{
+  fpos_t pos;
+
+  FLOCKFILE(fp);
+
+  if (fp->_seek == NULL) {
+    FUNLOCKFILE(fp);
+    errno = ESPIPE;     /* historic practice */
+    return ((off_t)-1);
+  }
+
+  /*
+   * Find offset of underlying I/O object, then
+   * adjust for buffered bytes.
+   */
+  __sflush(fp);   /* may adjust seek offset on append stream */
+  if (fp->_flags & __SOFF)
+    pos = fp->_offset;
+  else {
+    pos = (*fp->_seek)(fp->_cookie, (fpos_t)0, SEEK_CUR);
+    if (pos == (fpos_t)-1) {
+      FUNLOCKFILE(fp);
+      return (pos);
+    }
+  }
+  if (fp->_flags & __SRD) {
+    /*
+     * Reading.  Any unread characters (including
+     * those from ungetc) cause the position to be
+     * smaller than that in the underlying object.
+     */
+    pos -= fp->_r;
+    if (HASUB(fp))
+      pos -= fp->_ur;
+  } else if (fp->_flags & __SWR && fp->_p != NULL) {
+    /*
+     * Writing.  Any buffered characters cause the
+     * position to be greater than that in the
+     * underlying object.
+     */
+    pos += fp->_p - fp->_bf._base;
+  }
+  FUNLOCKFILE(fp);
+  return (pos);
+}

StdLib/LibC/Stdio/funopen.c

@@ -0,0 +1,82 @@
+/*  $NetBSD: funopen.c,v 1.10 2005/11/29 03:12:00 christos Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)funopen.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: funopen.c,v 1.10 2005/11/29 03:12:00 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <errno.h>
+#include "reentrant.h"
+#include "local.h"
+
+FILE *
+funopen(cookie, readfn, writefn, seekfn, closefn)
+  const void *cookie;
+  int (*readfn) __P((void *, char *, int));
+  int (*writefn) __P((void *, const char *, int));
+  fpos_t (*seekfn) __P((void *, fpos_t, int));
+  int (*closefn) __P((void *));
+{
+  FILE *fp;
+  int flags;
+
+  if (readfn == NULL) {
+    if (writefn == NULL) {    /* illegal */
+      errno = EINVAL;
+      return (NULL);
+    } else
+      flags = __SWR;    /* write only */
+  } else {
+    if (writefn == NULL)
+      flags = __SRD;    /* read only */
+    else
+      flags = __SRW;    /* read-write */
+  }
+  if ((fp = __sfp()) == NULL)
+    return (NULL);
+  fp->_flags = flags;
+  fp->_file = -1;
+  fp->_cookie = __UNCONST(cookie);
+  fp->_read = readfn;
+  fp->_write = writefn;
+  fp->_seek = seekfn;
+  fp->_close = closefn;
+  return (fp);
+}

StdLib/LibC/Stdio/fvwrite.c

@@ -0,0 +1,221 @@
+/*  $NetBSD: fvwrite.c,v 1.16.2.1 2007/05/07 19:49:09 pavel Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: fvwrite.c,v 1.16.2.1 2007/05/07 19:49:09 pavel Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+#include "fvwrite.h"
+
+/*
+ * Write some memory regions.  Return zero on success, EOF on error.
+ *
+ * This routine is large and unsightly, but most of the ugliness due
+ * to the three different kinds of output buffering is handled here.
+ */
+int
+__sfvwrite(FILE *fp, struct __suio *uio)
+{
+  size_t len;
+  char *p;
+  struct __siov *iov;
+  int w, s;
+  char *nl;
+  int nlknown, nldist;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(uio != NULL);
+
+  if ((len = uio->uio_resid) == 0)
+    return (0);
+  /* make sure we can write */
+  if (cantwrite(fp)) {
+    errno = EBADF;
+    return (EOF);
+  }
+
+//#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define COPY(n)   (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n))
+
+  iov = uio->uio_iov;
+  p = iov->iov_base;
+  len = iov->iov_len;
+  iov++;
+#define GETIOV(extra_work) \
+  while (len == 0) { \
+    extra_work; \
+    p = iov->iov_base; \
+    len = iov->iov_len; \
+    iov++; \
+  }
+  if (fp->_flags & __SNBF) {
+    /*
+     * Unbuffered: write up to BUFSIZ bytes at a time.
+     */
+    do {
+      GETIOV(;);
+      w = (*fp->_write)(fp->_cookie, p,
+          (int)MIN(len, BUFSIZ));
+      if (w <= 0)
+        goto err;
+      p += w;
+      len -= w;
+    } while ((uio->uio_resid -= w) != 0);
+  } else if ((fp->_flags & __SLBF) == 0) {
+    /*
+     * Fully buffered: fill partially full buffer, if any,
+     * and then flush.  If there is no partial buffer, write
+     * one _bf._size byte chunk directly (without copying).
+     *
+     * String output is a special case: write as many bytes
+     * as fit, but pretend we wrote everything.  This makes
+     * snprintf() return the number of bytes needed, rather
+     * than the number used, and avoids its write function
+     * (so that the write function can be invalid).
+     */
+    do {
+      GETIOV(;);
+      if ((fp->_flags & (__SALC | __SSTR)) ==
+          (__SALC | __SSTR) && fp->_w < (int)len) {
+        size_t blen = fp->_p - fp->_bf._base;
+        unsigned char *_base;
+        int _size;
+
+        /* Allocate space exponentially. */
+        _size = fp->_bf._size;
+        do {
+          _size = (_size << 1) + 1;
+        } while (_size < (int)(blen + len));
+        _base = realloc(fp->_bf._base,
+            (size_t)(_size + 1));
+        if (_base == NULL)
+          goto err;
+        fp->_w += _size - fp->_bf._size;
+        fp->_bf._base = _base;
+        fp->_bf._size = _size;
+        fp->_p = _base + blen;
+      }
+      w = fp->_w;
+      if (fp->_flags & __SSTR) {
+        if (len < (size_t)w)
+          w = (int)len;
+        COPY(w);  /* copy MIN(fp->_w,len), */
+        fp->_w -= w;
+        fp->_p += w;
+        w = (int)len;  /* but pretend copied all */
+      } else if (fp->_p > fp->_bf._base && len > (size_t)w) {
+        /* fill and flush */
+        COPY(w);
+        /* fp->_w -= w; */ /* unneeded */
+        fp->_p += w;
+        if (fflush(fp))
+          goto err;
+      } else if (len >= (size_t)(w = fp->_bf._size)) {
+        /* write directly */
+        w = (*fp->_write)(fp->_cookie, p, w);
+        if (w <= 0)
+          goto err;
+      } else {
+        /* fill and done */
+        w = (int)len;
+        COPY(w);
+        fp->_w -= w;
+        fp->_p += w;
+      }
+      p += w;
+      len -= w;
+    } while ((uio->uio_resid -= w) != 0);
+  } else {
+    /*
+     * Line buffered: like fully buffered, but we
+     * must check for newlines.  Compute the distance
+     * to the first newline (including the newline),
+     * or `infinity' if there is none, then pretend
+     * that the amount to write is MIN(len,nldist).
+     */
+    nlknown = 0;
+    nldist = 0; /* XXX just to keep gcc happy */
+    do {
+      GETIOV(nlknown = 0);
+      if (!nlknown) {
+        nl = memchr((void *)p, '\n', len);          // Divide the string at the first '\n'
+        nldist = (int)(nl ? nl + 1 - p : len + 1);
+        nlknown = 1;
+      }
+      s = (int)(MIN((int)len, nldist));
+      w = fp->_w + fp->_bf._size;
+      if (fp->_p > fp->_bf._base && s > w) {
+        COPY(w);
+        /* fp->_w -= w; */
+        fp->_p += w;
+        if (fflush(fp))
+          goto err;
+      } else if (s >= (w = fp->_bf._size)) {
+        w = (*fp->_write)(fp->_cookie, p, w);
+        if (w <= 0)
+          goto err;
+      } else {
+        w = s;
+        COPY(w);
+        fp->_w -= w;
+        fp->_p += w;
+      }
+      if ((nldist -= w) == 0) {
+        /* copied the newline: flush and forget */
+        if (fflush(fp))
+          goto err;
+        nlknown = 0;
+      }
+      p += w;
+      len -= w;
+    } while ((uio->uio_resid -= w) != 0);
+  }
+  return (0);
+
+err:
+  fp->_flags |= __SERR;
+  return (EOF);
+}

StdLib/LibC/Stdio/fvwrite.h

@@ -0,0 +1,50 @@
+/*	$NetBSD: fvwrite.h,v 1.7 2003/08/07 16:43:26 agc Exp $	*/
+
+/*-
+ * 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. 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.
+ *
+ *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * I/O descriptors for __sfvwrite().
+ */
+struct __siov {
+	void	*iov_base;
+	size_t	iov_len;
+};
+struct __suio {
+	struct	__siov *uio_iov;
+	int	uio_iovcnt;
+	int	uio_resid;
+};
+
+extern int __sfvwrite(FILE *, struct __suio *);

StdLib/LibC/Stdio/fwalk.c

@@ -0,0 +1,70 @@
+/** @file
+    Implementation of the internal fwalk function for <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fwalk.c,v 1.11 2003/08/07 16:43:26 agc Exp
+    fwalk.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+#include "glue.h"
+
+int
+_fwalk(int (*function)(FILE *))
+{
+  FILE *fp;
+  int n, ret;
+  struct glue *g;
+
+  _DIAGASSERT(function != NULL);
+
+  ret = 0;
+  for (g = &__sglue; g != NULL; g = g->next)
+    for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
+      if (fp->_flags != 0)
+        ret |= (*function)(fp);
+  return (ret);
+}

StdLib/LibC/Stdio/fwide.c

@@ -0,0 +1,72 @@
+/* $NetBSD: fwide.c,v 1.3 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: fwide.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <stdio.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+fwide(FILE *fp, int mode)
+{
+  struct wchar_io_data *wcio;
+
+  _DIAGASSERT(fp != NULL);
+
+  /*
+   * this implementation use only -1, 0, 1
+   * for mode value.
+   * (we don't need to do this, but
+   *  this can make things simpler.)
+   */
+  if (mode > 0)
+    mode = 1;
+  else if (mode < 0)
+    mode = -1;
+
+  FLOCKFILE(fp);
+  wcio = WCIO_GET(fp);
+  if (!wcio)
+    return 0; /* XXX */
+
+  if (wcio->wcio_mode == 0 && mode != 0)
+    wcio->wcio_mode = mode;
+  else
+    mode = wcio->wcio_mode;
+  FUNLOCKFILE(fp);
+
+  return mode;
+}

StdLib/LibC/Stdio/fwprintf.c

@@ -0,0 +1,53 @@
+/*  $NetBSD: fwprintf.c,v 1.1 2005/05/14 23:51:02 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
+#else
+__RCSID("$NetBSD: fwprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+fwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  va_start(ap, fmt);
+  ret = vfwprintf(fp, fmt, ap);
+  va_end(ap);
+
+  return (ret);
+}

StdLib/LibC/Stdio/fwrite.c

@@ -0,0 +1,89 @@
+/** @file
+    Implementation of fwrite as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: fwrite.c,v 1.16 2005/11/29 03:12:00 christos Exp
+    fwrite.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+#include "fvwrite.h"
+
+/*
+ * Write `count' objects (each size `size') from memory to the given file.
+ * Return the number of whole objects written.
+ */
+size_t
+fwrite(const void *buf, size_t size, size_t count, FILE *fp)
+{
+  size_t n;
+  struct __suio uio;
+  struct __siov iov;
+
+  _DIAGASSERT(fp != NULL);
+  /*
+   * SUSv2 requires a return value of 0 for a count or a size of 0.
+   */
+  if ((n = count * size) == 0)
+    return (0);
+  _DIAGASSERT(buf != NULL);
+
+  iov.iov_base = __UNCONST(buf);
+  uio.uio_resid = (int)(iov.iov_len = n);
+  uio.uio_iov = &iov;
+  uio.uio_iovcnt = 1;
+
+  /*
+   * The usual case is success (__sfvwrite returns 0);
+   * skip the divide if this happens, since divides are
+   * generally slow and since this occurs whenever size==0.
+   */
+  FLOCKFILE(fp);
+  if (__sfvwrite(fp, &uio) != 0)
+    count = ((n - uio.uio_resid) / size);
+  FUNLOCKFILE(fp);
+  return (count);
+}

StdLib/LibC/Stdio/fwscanf.c

@@ -0,0 +1,53 @@
+/*  $NetBSD: fwscanf.c,v 1.1 2005/05/14 23:51:02 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
+#else
+__RCSID("$NetBSD: fwscanf.c,v 1.1 2005/05/14 23:51:02 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+fwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
+{
+  va_list ap;
+  int r;
+
+  va_start(ap, fmt);
+  r = vfwscanf(fp, fmt, ap);
+  va_end(ap);
+
+  return (r);
+}

StdLib/LibC/Stdio/getc.c

@@ -0,0 +1,80 @@
+/** @file
+    Implementation of getc as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: getc.c,v 1.11 2003/08/07 16:43:26 agc Exp
+    getc.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * A subroutine version of the macro getc.
+ */
+#undef getc
+#undef getc_unlocked
+
+int
+getc(FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sgetc(fp);
+  FUNLOCKFILE(fp);
+  return r;
+}
+
+int
+getc_unlocked(FILE *fp)
+{
+
+  _DIAGASSERT(fp != NULL);
+
+  return (__sgetc(fp));
+}

StdLib/LibC/Stdio/getchar.c

@@ -0,0 +1,72 @@
+/** @file
+    Implementation of a subroutine version of the macro getchar,
+    as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: getchar.c,v 1.9 2003/08/07 16:43:27 agc Exp
+    getchar.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#undef getchar
+#undef getchar_unlocked
+
+int
+getchar( void )
+{
+  FILE *fp = stdin;
+  int r;
+
+        FLOCKFILE(fp);
+        r = __sgetc(fp);
+        FUNLOCKFILE(fp);
+        return r;
+}
+
+int
+getchar_unlocked( void )
+{
+  return (__sgetc(stdin));
+}

StdLib/LibC/Stdio/gets.c

@@ -0,0 +1,80 @@
+/** @file
+    Implementation of gets as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: gets.c,v 1.15 2003/08/07 16:43:27 agc Exp
+    gets.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+__warn_references(gets, "warning: this program uses gets(), which is unsafe.")
+
+char *
+gets(char *buf)
+{
+  int c;
+  char *s;
+
+  _DIAGASSERT(buf != NULL);
+
+  FLOCKFILE(stdin);
+  for (s = buf; (c = getchar_unlocked()) != '\n'; ) {
+    if (c == EOF) {
+      if (s == buf) {
+        FUNLOCKFILE(stdin);
+        return (NULL);
+      } else {
+        break;
+      }
+    } else {
+      *s++ = (char)c;
+    }
+  }
+  *s = 0;
+  FUNLOCKFILE(stdin);
+  return (buf);
+}

StdLib/LibC/Stdio/gettemp.c

@@ -0,0 +1,183 @@
+/** @file
+  Internal function to generate temporary file name for tmpnam.
+
+  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License that accompanies this
+  distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Copyright (c) 1987, 1993
+   The Regents of the University of California.  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.
+    3. 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.
+
+  NetBSD: gettemp.c,v 1.13 2003/12/05 00:57:36 uebayasi Exp
+**/
+#include  <LibConfig.h>
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP
+
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)mktemp.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: gettemp.c,v 1.13 2003/12/05 00:57:36 uebayasi Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/EfiSysCall.h>
+
+#if HAVE_NBTOOL_CONFIG_H
+#define GETTEMP   gettemp
+#else
+#include "reentrant.h"
+#include "local.h"
+#define GETTEMP   __gettemp
+#endif
+
+int
+GETTEMP(
+  char *path,
+  int *doopen,
+  int domkdir
+  )
+{
+  char *start, *trv;
+  struct stat sbuf;
+
+  /* To guarantee multiple calls generate unique names even if
+     the file is not created. 676 different possibilities with 7
+     or more X's, 26 with 6 or less. */
+  static char xtra[] = "aa";
+  int xcnt = 0;
+
+  _DIAGASSERT(path != NULL);
+  /* doopen may be NULL */
+
+  /* Move to end of path and count trailing X's. */
+  for (trv = path; *trv; ++trv) {
+    if (*trv == 'X') {
+      xcnt++;
+    }
+    else {
+      xcnt = 0;
+    }
+  }
+
+  /* Use at least one from xtra.  Use 2 if more than 6 X's. */
+  if (*(trv - 1) == 'X')
+    *--trv = xtra[0];
+  if (xcnt > 6 && *(trv - 1) == 'X')
+    *--trv = xtra[1];
+
+  /* Set remaining X's to 0's. */
+  while (*--trv == 'X') {
+    *trv = '0';
+  }
+
+  /* update xtra for next call. */
+  if (xtra[0] != 'z')
+    xtra[0]++;
+  else {
+    xtra[0] = 'a';
+    if (xtra[1] != 'z')
+      xtra[1]++;
+    else
+      xtra[1] = 'a';
+  }
+
+  /*
+   * check the target directory; if you have six X's and it
+   * doesn't exist this runs for a *very* long time.
+   */
+  for (start = trv + 1;; --trv) {
+    if (trv <= path)
+      break;
+    if (*trv == '/') {
+      *trv = '\0';
+      if (stat(path, &sbuf))
+        return (0);
+      if (!S_ISDIR(sbuf.st_mode)) {
+        errno = ENOTDIR;
+        return (0);
+      }
+      *trv = '/';
+      break;
+    }
+  }
+
+  for (;;) {
+    if (doopen) {
+      if ((*doopen =
+          open(path, O_CREAT | O_EXCL | O_RDWR, 0600)) >= 0)
+        return (1);
+      if (errno != EEXIST)
+        return (0);
+    } else if (domkdir) {
+      if (mkdir(path, 0700) >= 0)
+        return (1);
+      if (errno != EEXIST)
+        return (0);
+    } else if (lstat(path, &sbuf))
+      return (errno == ENOENT ? 1 : 0);
+
+    /* tricky little algorithm for backward compatibility */
+    for (trv = start;;) {
+      if (!*trv)
+        return (0);
+      if (*trv == 'z') {
+        *trv++ = 'a';
+      }
+      else {
+        if (isdigit((unsigned char)*trv))
+          *trv = 'a';
+        else
+          ++*trv;
+        break;
+      }
+    }
+  }
+  /*NOTREACHED*/
+}
+
+#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP || !HAVE_MKDTEMP */

StdLib/LibC/Stdio/getwc.c

@@ -0,0 +1,49 @@
+/* $NetBSD: getwc.c,v 1.3 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: getwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <wchar.h>
+
+/*
+ * A subroutine version of the macro getwc.
+ */
+#undef getwc
+
+wint_t
+getwc(FILE *fp)
+{
+
+  return fgetwc(fp);
+}

StdLib/LibC/Stdio/getwchar.c

@@ -0,0 +1,49 @@
+/* $NetBSD: getwchar.c,v 1.3 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: getwchar.c,v 1.3 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <wchar.h>
+
+/*
+ * A subroutine version of the macro getwchar.
+ */
+#undef getwchar
+
+wint_t
+getwchar()
+{
+
+  return fgetwc(stdin);
+}

StdLib/LibC/Stdio/glue.h

@@ -0,0 +1,47 @@
+/*	$NetBSD: glue.h,v 1.5 2003/08/07 16:43:27 agc Exp $	*/
+
+/*-
+ * 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. 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.
+ *
+ *	@(#)glue.h	8.1 (Berkeley) 6/4/93
+ */
+
+/*
+ * The first few FILEs are statically allocated; others are dynamically
+ * allocated and linked in via this glue structure.
+ */
+struct glue {
+	struct	glue *next;
+	int	niobs;
+	FILE	*iobs;
+};
+
+extern struct glue __sglue;

StdLib/LibC/Stdio/local.h

@@ -0,0 +1,113 @@
+/** @file
+    Information local to this implementation of stdio,
+    in particular, function declarations and macros.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: local.h,v 1.20 2005/05/14 23:51:02 christos Exp
+    local.h 8.3 (Berkeley) 7/3/94
+**/
+
+#include "wcio.h"
+#include "fileext.h"
+
+extern int      __sflush(FILE *);
+extern FILE    *__sfp(void);
+extern int      __srefill(FILE *);
+extern int      __sread(void *, char *, int);
+extern int      __swrite(void *, char const *, int);
+extern fpos_t   __sseek(void *, fpos_t, int);
+extern int      __sclose(void *);
+extern void     __sinit(void);
+extern void     _cleanup(void);
+//extern void   (*__cleanup)(void);   // Now in MainData.h.  Ref. as gMD->cleanup
+extern void     __smakebuf(FILE *);
+extern int      __swhatbuf(FILE *, size_t *, int *);
+extern int      _fwalk(int (*)(FILE *));
+extern char    *_mktemp(char *);
+extern int      __swsetup(FILE *);
+extern int      __sflags(const char *, int *);
+extern int      __svfscanf(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
+                            __attribute__((__format__(__scanf__, 2, 0)));
+extern int      __svfscanf_unlocked(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_)
+                            __attribute__((__format__(__scanf__, 2, 0)));
+extern int      __vfprintf_unlocked(FILE * __restrict, const char * __restrict, _BSD_VA_LIST_);
+
+
+extern int      __sdidinit;
+
+extern int      __gettemp(char *, int *, int);
+
+extern wint_t   __fgetwc_unlock(FILE *);
+extern wint_t   __fputwc_unlock(wchar_t, FILE *);
+
+extern char    *__fgetstr(FILE * __restrict, size_t * __restrict, int);
+extern int      __slbexpand(FILE *, size_t);
+extern int      __vfwprintf_unlocked(FILE *, const wchar_t *, _BSD_VA_LIST_);
+extern int      __vfwscanf_unlocked(FILE * __restrict, const wchar_t * __restrict, _BSD_VA_LIST_);
+
+/*
+ * Return true iff the given FILE cannot be written now.
+ */
+#define cantwrite(fp) \
+  ((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && __swsetup(fp))
+
+/*
+ * Test whether the given stdio file has an active ungetc buffer;
+ * release such a buffer, without restoring ordinary unread data.
+ */
+#define HASUB(fp) (_UB(fp)._base != NULL)
+#define FREEUB(fp) { \
+    if (_UB(fp)._base != (fp)->_ubuf) \
+      free((char *)_UB(fp)._base); \
+    _UB(fp)._base = NULL; \
+  }
+
+/*
+ * test for an fgetln() buffer.
+ */
+#define HASLB(fp) ((fp)->_lb._base != NULL)
+#define FREELB(fp) { \
+    free((char *)(fp)->_lb._base); \
+    (fp)->_lb._base = NULL; \
+  }
+
+extern void __flockfile_internal  (FILE *, int);
+extern void __funlockfile_internal(FILE *, int);

StdLib/LibC/Stdio/makebuf.c

@@ -0,0 +1,132 @@
+/** @file
+    Implementation of internal file buffer allocation functions.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: makebuf.c,v 1.14 2003/08/07 16:43:28 agc Exp
+    makebuf.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include  "namespace.h"
+
+#include  <sys/types.h>
+#include  <sys/stat.h>
+#include  <assert.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <sys/EfiSysCall.h>
+#include  "reentrant.h"
+#include  "local.h"
+#include  <MainData.h>
+
+/*
+ * Allocate a file buffer, or switch to unbuffered I/O.
+ * Per the ANSI C standard, ALL tty devices default to line buffered.
+ *
+ * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek
+ * optimisation) right after the fstat() that finds the buffer size.
+ */
+void
+__smakebuf(FILE *fp)
+{
+  void *p;
+  int flags;
+  size_t size;
+  int couldbetty;
+
+  _DIAGASSERT(fp != NULL);
+
+  if (fp->_flags & __SNBF) {
+    fp->_bf._base = fp->_p = fp->_nbuf;
+    fp->_bf._size = 1;
+    return;
+  }
+  flags = __swhatbuf(fp, &size, &couldbetty);
+  if ((p = malloc(size)) == NULL) {
+    fp->_flags |= __SNBF;
+    fp->_bf._base = fp->_p = fp->_nbuf;
+    fp->_bf._size = 1;
+    return;
+  }
+  gMD->cleanup = _cleanup;
+  flags |= __SMBF;
+  fp->_bf._base = fp->_p = p;
+  fp->_bf._size = (int)size;
+  if (couldbetty || isatty(fp->_file))
+    flags |= __SLBF;
+  fp->_flags |= flags;
+}
+
+/*
+ * Internal routine to determine `proper' buffering for a file.
+ */
+int
+__swhatbuf(FILE *fp, size_t *bufsize, int *couldbetty)
+{
+  struct stat st;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(bufsize != NULL);
+  _DIAGASSERT(couldbetty != NULL);
+
+  if (fp->_file < 0 || fstat(fp->_file, &st) < 0) {
+    *couldbetty = 0;
+    *bufsize = BUFSIZ;
+    return (__SNPT);
+  }
+
+  /* could be a tty iff it is a character device */
+  *couldbetty = S_ISCHR(st.st_mode);
+  if (st.st_blksize == 0) {
+    *bufsize = BUFSIZ;
+    return (__SNPT);
+  }
+
+  /*
+   * Optimise fseek() only if it is a regular file.  (The test for
+   * __sseek is mainly paranoia.)  It is safe to set _blksize
+   * unconditionally; it will only be used if __SOPT is also set.
+   */
+  *bufsize = st.st_blksize;
+  fp->_blksize = st.st_blksize;
+  return ((st.st_mode & S_IFMT) == S_IFREG && fp->_seek == __sseek ?
+      __SOPT : __SNPT);
+}

StdLib/LibC/Stdio/mkdtemp.c

@@ -0,0 +1,69 @@
+/*  $NetBSD: mkdtemp.c,v 1.9 2003/10/27 00:12:42 lukem Exp $  */
+
+/*
+ * Copyright (c) 1987, 1993
+ *  The Regents of the University of California.  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.
+ * 3. 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  <LibConfig.h>
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP
+
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)mktemp.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: mkdtemp.c,v 1.9 2003/10/27 00:12:42 lukem Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#if HAVE_NBTOOL_CONFIG_H
+#define GETTEMP   gettemp
+#else
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  "reentrant.h"
+#include  "local.h"
+#define GETTEMP   __gettemp
+#endif
+
+char *
+mkdtemp(path)
+  char *path;
+{
+  _DIAGASSERT(path != NULL);
+
+  return (GETTEMP(path, (int *)NULL, 1) ? path : (char *)NULL);
+}
+
+#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP */

StdLib/LibC/Stdio/mkstemp.c

@@ -0,0 +1,76 @@
+/*  $NetBSD: mkstemp.c,v 1.9 2005/02/09 21:35:47 kleink Exp $ */
+
+/*
+ * Copyright (c) 1987, 1993
+ *  The Regents of the University of California.  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.
+ * 3. 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  <LibConfig.h>
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP
+
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)mktemp.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: mkstemp.c,v 1.9 2005/02/09 21:35:47 kleink Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  "namespace.h"
+
+#if HAVE_NBTOOL_CONFIG_H
+#define GETTEMP   gettemp
+#else
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  "reentrant.h"
+#include  "local.h"
+#define GETTEMP   __gettemp
+#endif
+
+#ifdef __weak_alias
+__weak_alias(mkstemp,_mkstemp)
+#endif
+
+int
+mkstemp(char *path)
+{
+  int fd;
+
+  _DIAGASSERT(path != NULL);
+
+  return (GETTEMP(path, &fd, 0) ? fd : -1);
+}
+
+#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKSTEMP */

StdLib/LibC/Stdio/mktemp.c

@@ -0,0 +1,71 @@
+/** @file
+  Internal function for tmpnam.
+
+  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License that accompanies this
+  distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+  Copyright (c) 1990, 1993
+  The Regents of the University of California.  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
+  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.
+  - 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 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 HOLDERS 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.
+
+NetBSD: mktemp.c,v 1.19 2003/08/07 16:43:28 agc Exp
+mktemp.c  8.1 (Berkeley) 6/4/93
+  **/
+#include  <LibConfig.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <sys/EfiSysCall.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+char *
+_mktemp(char *path)
+{
+  _DIAGASSERT(path != NULL);
+
+  return (__gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
+}
+
+__warn_references(mktemp,
+    "warning: mktemp() possibly used unsafely, use mkstemp() or mkdtemp()")
+
+char *
+mktemp(char *path)
+{
+
+  _DIAGASSERT(path != NULL);
+
+  return (__gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
+}

StdLib/LibC/Stdio/perror.c

@@ -0,0 +1,72 @@
+/** @file
+    Implementation of perror as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    Portions Copyright (c) 1990, 1993
+    The Regents of the University of California.  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
+        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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: perror.c,v 1.24 2006/01/26 11:13:42 kleink Exp
+    perror.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include "namespace.h"
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include "extern.h"
+
+/*
+ * Since perror() is not allowed to change the contents of strerror()'s
+ * static buffer, both functions supply their own buffers to strerror_r().
+ */
+
+void
+perror(const char *s)
+{
+  static char buf[ASCII_STRING_MAX];
+  const char *separator;
+
+  if (s == NULL)
+    s = "";
+  if (*s == '\0')
+    separator = "";
+  else
+    separator = ": ";
+
+  (void)strerror_r(errno, buf, sizeof(buf));
+  (void)fprintf(stderr, "%s%s%s\n", s, separator, buf);
+}

StdLib/LibC/Stdio/printf.c

@@ -0,0 +1,63 @@
+/** @file
+    Implementation of printf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: printf.c,v 1.11 2003/08/07 16:43:29 agc Exp
+    printf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+int
+printf(char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  va_start(ap, fmt);
+  ret = vfprintf(stdout, fmt, ap);
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/putc.c

@@ -0,0 +1,80 @@
+/** @file
+    Implementation of a subroutine version of the macro putc,
+    as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: putc.c,v 1.11 2003/08/07 16:43:29 agc Exp
+    putc.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * putc.
+ */
+#undef putc
+#undef putc_unlocked
+
+int
+putc(int c, FILE *fp)
+{
+  int r;
+
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  r = __sputc(c, fp);
+  FUNLOCKFILE(fp);
+  return r;
+}
+
+int
+putc_unlocked(int c, FILE *fp)
+{
+  _DIAGASSERT(fp != NULL);
+
+  return (__sputc(c, fp));
+}

StdLib/LibC/Stdio/putchar.c

@@ -0,0 +1,75 @@
+/** @file
+    Implementation of a subroutine version of the macro putchar,
+    as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: putchar.c,v 1.9 2003/08/07 16:43:29 agc Exp
+    putchar.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#undef putchar
+#undef putchar_unlocked
+
+/*
+ * putchar
+ */
+int
+putchar(int c)
+{
+  FILE *fp = stdout;
+  int   r;
+
+  FLOCKFILE(fp);
+  r = __sputc(c, fp);
+  FUNLOCKFILE(fp);
+  return r;
+}
+
+int
+putchar_unlocked(int c)
+{
+  return (__sputc(c, stdout));
+}

StdLib/LibC/Stdio/puts.c

@@ -0,0 +1,85 @@
+/** @file
+    Implementation of puts as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: puts.c,v 1.15 2006/03/17 02:25:23 chris Exp
+    puts.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "fvwrite.h"
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Write the given string to stdout, appending a newline.
+ */
+int
+puts(char const *s)
+{
+  size_t c;
+  struct __suio uio;
+  struct __siov iov[2];
+  int r;
+
+  _DIAGASSERT(s != NULL);
+
+  if (s == NULL)
+    s = "(null)";
+
+  c = strlen(s);
+
+  iov[0].iov_base = __UNCONST(s);
+  iov[0].iov_len = c;
+  iov[1].iov_base = __UNCONST("\n");
+  iov[1].iov_len = 1;
+  uio.uio_resid = (int)(c + 1);
+  uio.uio_iov = &iov[0];
+  uio.uio_iovcnt = 2;
+  FLOCKFILE(stdout);
+  r = __sfvwrite(stdout, &uio);
+  FUNLOCKFILE(stdout);
+  return (r ? EOF : '\n');
+}

StdLib/LibC/Stdio/putwc.c

@@ -0,0 +1,49 @@
+/* $NetBSD: putwc.c,v 1.4 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: putwc.c,v 1.4 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <wchar.h>
+
+/*
+ * A subroutine version of the macro putwc.
+ */
+#undef putwc
+
+wint_t
+putwc(wchar_t wc, FILE *fp)
+{
+
+  return fputwc(wc, fp);
+}

StdLib/LibC/Stdio/putwchar.c

@@ -0,0 +1,49 @@
+/* $NetBSD: putwchar.c,v 1.4 2005/06/12 05:21:27 lukem 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:
+ * 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.
+ *
+ * $Citrus$
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: putwchar.c,v 1.4 2005/06/12 05:21:27 lukem Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <wchar.h>
+
+/*
+ * A subroutine version of the macro putwchar.
+ */
+#undef putwchar
+
+wint_t
+putwchar(wchar_t wc)
+{
+
+  return fputwc(wc, stdout);
+}

StdLib/LibC/Stdio/refill.c

@@ -0,0 +1,162 @@
+/*  $NetBSD: refill.c,v 1.13 2003/08/07 16:43:30 agc Exp $  */
+
+/*-
+ * 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. 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 <Uefi.h>               // REMOVE, For DEBUG only
+#include <Library/UefiLib.h>    // REMOVE, For DEBUG only
+
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)refill.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: refill.c,v 1.13 2003/08/07 16:43:30 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef _REENTRANT
+extern rwlock_t __sfp_lock;
+#endif
+
+static int lflush(FILE *);
+
+static int
+lflush(FILE *fp)
+{
+
+  //_DIAGASSERT(fp != NULL);
+
+  if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
+    return (__sflush(fp));
+  return (0);
+}
+
+/*
+ * Refill a stdio buffer.
+ * Return EOF on eof or error, 0 otherwise.
+ */
+int
+__srefill(FILE *fp)
+{
+
+  //_DIAGASSERT(fp != NULL);
+
+  /* make sure stdio is set up */
+  if (!__sdidinit)
+    __sinit();
+
+//Print(L"%a( %d)\n", __func__, fp->_file);
+  fp->_r = 0;   /* largely a convenience for callers */
+
+  /* SysV does not make this test; take it out for compatibility */
+  if (fp->_flags & __SEOF) {
+//Print(L"%a: %d\n", __func__, __LINE__);
+    return (EOF);
+  }
+
+  /* if not already reading, have to be reading and writing */
+  if ((fp->_flags & __SRD) == 0) {
+//Print(L"%a: %d\n", __func__, __LINE__);
+    if ((fp->_flags & __SRW) == 0) {
+      errno = EBADF;
+      fp->_flags |= __SERR;   //<dvm> Allows differentiation between errors and EOF
+//Print(L"%a: %d\n", __func__, __LINE__);
+      return (EOF);
+    }
+    /* switch to reading */
+    if (fp->_flags & __SWR) {
+      if (__sflush(fp)) {
+//Print(L"%a: %d\n", __func__, __LINE__);
+        return (EOF);
+      }
+      fp->_flags &= ~__SWR;
+      fp->_w = 0;
+      fp->_lbfsize = 0;
+    }
+    fp->_flags |= __SRD;
+  } else {
+//Print(L"%a: %d\n", __func__, __LINE__);
+    /*
+     * We were reading.  If there is an ungetc buffer,
+     * we must have been reading from that.  Drop it,
+     * restoring the previous buffer (if any).  If there
+     * is anything in that buffer, return.
+     */
+    if (HASUB(fp)) {
+      FREEUB(fp);
+      if ((fp->_r = fp->_ur) != 0) {
+        fp->_p = fp->_up;
+//Print(L"%a: %d\n", __func__, __LINE__);
+        return (0);
+      }
+    }
+  }
+
+  if (fp->_bf._base == NULL)
+    __smakebuf(fp);
+
+//Print(L"%a: %d\n", __func__, __LINE__);
+  /*
+   * Before reading from a line buffered or unbuffered file,
+   * flush all line buffered output files, per the ANSI C
+   * standard.
+   */
+  if (fp->_flags & (__SLBF|__SNBF)) {
+    rwlock_rdlock(&__sfp_lock);
+    (void) _fwalk(lflush);
+    rwlock_unlock(&__sfp_lock);
+//Print(L"%a: %d\n", __func__, __LINE__);
+  }
+  fp->_p = fp->_bf._base;
+  fp->_r = (*fp->_read)(fp->_cookie, (char *)fp->_p, fp->_bf._size);
+  fp->_flags &= ~__SMOD;  /* buffer contents are again pristine */
+  if (fp->_r <= 0) {
+    if (fp->_r == 0)
+      fp->_flags |= __SEOF;
+    else {
+      fp->_r = 0;
+      fp->_flags |= __SERR;
+    }
+//Print(L"%a: %d\n", __func__, __LINE__);
+    return (EOF);
+  }
+//Print(L"%a: %d\n", __func__, __LINE__);
+  return (0);
+}

StdLib/LibC/Stdio/remove.c

@@ -0,0 +1,70 @@
+/*  $NetBSD: remove.c,v 1.13 2003/08/07 16:43:30 agc Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)remove.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: remove.c,v 1.13 2003/08/07 16:43:30 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  <sys/types.h>
+#include  <sys/stat.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <sys/EfiSysCall.h>
+
+int
+remove(const char *file)
+{
+  struct stat sb;
+
+  _DIAGASSERT(file != NULL);
+
+  if (lstat(file, &sb) < 0)
+    return (-1);
+
+  /*
+   * The file system may prohibit using unlink(2) on directories,
+   * so always use rmdir(2) in that case.
+   */
+  if (S_ISDIR(sb.st_mode))
+    return (rmdir(file));
+  else
+    return (unlink(file));
+}

StdLib/LibC/Stdio/rewind.c

@@ -0,0 +1,63 @@
+/** @file
+    Implementation of rewind as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: rewind.c,v 1.13 2003/08/07 16:43:30 agc Exp
+    rewind.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+void
+rewind(FILE *fp)
+{
+  _DIAGASSERT(fp != NULL);
+
+  FLOCKFILE(fp);
+  (void) fseek(fp, 0L, SEEK_SET);
+  __sclearerr(fp);
+  FUNLOCKFILE(fp);
+}

StdLib/LibC/Stdio/rget.c

@@ -0,0 +1,70 @@
+/** @file
+    Internal function to refill the buffer when getc() empties it.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: rget.c,v 1.12 2003/08/07 16:43:30 agc Exp
+    rget.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Handle getc() when the buffer ran out:
+ * Refill, then return the first character
+ * in the newly-filled buffer.
+ */
+int
+__srget(FILE *fp)
+{
+  _DIAGASSERT(fp != NULL);
+
+  _SET_ORIENTATION(fp, -1);
+  if (__srefill(fp) == 0) {
+    fp->_r--;
+    return (*fp->_p++);
+  }
+  return (EOF);
+}

StdLib/LibC/Stdio/scanf.c

@@ -0,0 +1,64 @@
+/*  $NetBSD: scanf.c,v 1.12 2003/08/07 16:43:31 agc Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)scanf.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: scanf.c,v 1.12 2003/08/07 16:43:31 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+int
+scanf(char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  _DIAGASSERT(fmt != NULL);
+
+  va_start(ap, fmt);
+  ret = __svfscanf(stdin, fmt, ap);
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/setbuf.c

@@ -0,0 +1,63 @@
+/** @file
+    Implementation of setbuf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: setbuf.c,v 1.9 2003/08/07 16:43:31 agc Exp
+    setbuf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+void
+setbuf(FILE *fp, char *buf)
+{
+
+  _DIAGASSERT(fp != NULL);
+  /* buf may be NULL */
+
+  (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
+}

StdLib/LibC/Stdio/setbuffer.c

@@ -0,0 +1,72 @@
+/*  $NetBSD: setbuffer.c,v 1.10 2003/08/07 16:43:31 agc Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)setbuffer.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: setbuffer.c,v 1.10 2003/08/07 16:43:31 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+void
+setbuffer(fp, buf, size)
+  FILE *fp;
+  char *buf;
+  int size;
+{
+
+  _DIAGASSERT(fp != NULL);
+  /* buf may be NULL */
+
+  (void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
+}
+
+/*
+ * set line buffering
+ */
+int
+setlinebuf(fp)
+  FILE *fp;
+{
+
+  _DIAGASSERT(fp != NULL);
+
+  return (setvbuf(fp, (char *)NULL, _IOLBF, (size_t)0));
+}

StdLib/LibC/Stdio/setvbuf.c

@@ -0,0 +1,176 @@
+/** @file
+    Implementation of setvbuf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: setvbuf.c,v 1.17 2003/08/07 16:43:31 agc Exp
+    setvbuf.c 8.2 (Berkeley) 11/16/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include "reentrant.h"
+#include "local.h"
+#include  <MainData.h>
+
+/*
+ * Set one of the three kinds of buffering, optionally including
+ * a buffer.
+ */
+int
+setvbuf(FILE *fp, char *buf, int mode, size_t size)
+{
+  int ret, flags;
+  size_t iosize;
+  int ttyflag;
+
+  _DIAGASSERT(fp != NULL);
+  /* buf may be NULL */
+
+  /*
+   * Verify arguments.  The `int' limit on `size' is due to this
+   * particular implementation.  Note, buf and size are ignored
+   * when setting _IONBF.
+   */
+  if (mode != _IONBF)
+    if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0)
+      return (-1);
+
+  FLOCKFILE(fp);
+  /*
+   * Write current buffer, if any.  Discard unread input (including
+   * ungetc data), cancel line buffering, and free old buffer if
+   * malloc()ed.  We also clear any eof condition, as if this were
+   * a seek.
+   */
+  ret = 0;
+  (void)__sflush(fp);
+  if (HASUB(fp))
+    FREEUB(fp);
+  WCIO_FREE(fp);
+  fp->_r = fp->_lbfsize = 0;
+  flags = fp->_flags;
+  if (flags & __SMBF)
+    free((void *)fp->_bf._base);
+  flags &= ~(__SLBF | __SNBF | __SMBF | __SOPT | __SNPT | __SEOF);
+
+  /* If setting unbuffered mode, skip all the hard work. */
+  if (mode == _IONBF)
+    goto nbf;
+
+  /*
+   * Find optimal I/O size for seek optimization.  This also returns
+   * a `tty flag' to suggest that we check isatty(fd), but we do not
+   * care since our caller told us how to buffer.
+   */
+  flags |= __swhatbuf(fp, &iosize, &ttyflag);
+  if (size == 0) {
+    buf = NULL; /* force local allocation */
+    size = iosize;
+  }
+
+  /* Allocate buffer if needed. */
+  if (buf == NULL) {
+    if ((buf = malloc(size)) == NULL) {
+      /*
+       * Unable to honor user's request.  We will return
+       * failure, but try again with file system size.
+       */
+      ret = -1;
+      if (size != iosize) {
+        size = iosize;
+        buf = malloc(size);
+      }
+    }
+    if (buf == NULL) {
+      /* No luck; switch to unbuffered I/O. */
+nbf:
+      fp->_flags = (unsigned short)(flags | __SNBF);
+      fp->_w = 0;
+      fp->_bf._base = fp->_p = fp->_nbuf;
+      fp->_bf._size = 1;
+      FUNLOCKFILE(fp);
+      return (ret);
+    }
+    flags |= __SMBF;
+  }
+
+  /*
+   * Kill any seek optimization if the buffer is not the
+   * right size.
+   *
+   * SHOULD WE ALLOW MULTIPLES HERE (i.e., ok iff (size % iosize) == 0)?
+   */
+  if (size != iosize)
+    flags |= __SNPT;
+
+  /*
+   * Fix up the FILE fields, and set gMD->cleanup for output flush on
+   * exit (since we are buffered in some way).
+   */
+  if (mode == _IOLBF)
+    flags |= __SLBF;
+  fp->_flags = (unsigned short)flags;
+  fp->_bf._base = fp->_p = (unsigned char *)buf;
+  fp->_bf._size = (int)size;
+  /* fp->_lbfsize is still 0 */
+  if (flags & __SWR) {
+    /*
+     * Begin or continue writing: see __swsetup().  Note
+     * that __SNBF is impossible (it was handled earlier).
+     */
+    if (flags & __SLBF) {
+      fp->_w = 0;
+      fp->_lbfsize = -fp->_bf._size;
+    } else
+      fp->_w = (int)size;
+  } else {
+    /* begin/continue reading, or stay in intermediate state */
+    fp->_w = 0;
+  }
+  gMD->cleanup = _cleanup;
+
+  FUNLOCKFILE(fp);
+  return (ret);
+}

StdLib/LibC/Stdio/snprintf.c

@@ -0,0 +1,93 @@
+/** @file
+    Implementation of internal snprintf function for <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: snprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp
+    snprintf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(snprintf,_snprintf)
+#endif
+
+int
+snprintf(char *str, size_t n, char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  struct __sfileext fext;
+  unsigned char dummy[1];
+
+  _DIAGASSERT(n == 0 || str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  if ((int)n < 0) {
+    errno = EINVAL;
+    return (-1);
+  }
+  va_start(ap, fmt);
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR;
+  if (n == 0) {
+    f._bf._base = f._p = dummy;
+    f._bf._size = f._w = 0;
+  } else {
+    f._bf._base = f._p = (unsigned char *)str;
+    f._bf._size = f._w = (int)(n - 1);
+  }
+  ret = __vfprintf_unlocked(&f, fmt, ap);
+  *f._p = 0;
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/snprintf_ss.c

@@ -0,0 +1,69 @@
+/*  $NetBSD: snprintf_ss.c,v 1.3.2.1 2007/05/07 19:49:08 pavel Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)snprintf.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: snprintf_ss.c,v 1.3.2.1 2007/05/07 19:49:08 pavel Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "extern.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(snprintf_ss,_snprintf_ss)
+#endif
+
+int
+snprintf_ss(char *str, size_t n, char const *fmt, ...)
+{
+  va_list ap;
+  int ret;
+
+  va_start(ap, fmt);
+  ret = vsnprintf_ss(str, n, fmt, ap);
+  va_end(ap);
+  return ret;
+}

StdLib/LibC/Stdio/sprintf.c

@@ -0,0 +1,78 @@
+/** @file
+    Implementation of sprintf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: sprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp
+    sprintf.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+int
+sprintf(char *str, char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  struct __sfileext fext;
+
+  _DIAGASSERT(str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR;
+  f._bf._base = f._p = (unsigned char *)str;
+  f._bf._size = f._w = INT_MAX;
+  va_start(ap, fmt);
+  ret = __vfprintf_unlocked(&f, fmt, ap);
+  va_end(ap);
+  *f._p = 0;
+  return (ret);
+}

StdLib/LibC/Stdio/sscanf.c

@@ -0,0 +1,89 @@
+/** @file
+    Implementation of sscanf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: sscanf.c,v 1.16 2005/11/29 03:12:00 christos Exp
+    sscanf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+static int eofread(void *, char *, int);
+
+/* ARGSUSED */
+static int
+eofread(void *cookie, char *buf, int len)
+{
+
+  return (0);
+}
+
+int
+sscanf(const char *str, char const *fmt, ...)
+{
+  int ret;
+  va_list ap;
+  FILE f;
+  struct __sfileext fext;
+
+  _DIAGASSERT(str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._flags = __SRD;
+  f._bf._base = f._p = __UNCONST(str);
+  f._bf._size = f._r = (int)strlen(str);
+  f._read = eofread;
+  _UB(&f)._base = NULL;
+  f._lb._base = NULL;
+  va_start(ap, fmt);
+  ret = __svfscanf_unlocked(&f, fmt, ap);
+  va_end(ap);
+  return (ret);
+}

StdLib/LibC/Stdio/stdio.c

@@ -0,0 +1,117 @@
+/** @file
+    Small standard I/O/seek/close functions.
+    These maintain the `known seek offset' for seek optimisation.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: stdio.c,v 1.13 2003/08/07 16:43:33 agc Exp
+    stdio.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include  "namespace.h"
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <fcntl.h>
+#include  <stdio.h>
+#include  <sys/EfiSysCall.h>
+
+#include  "reentrant.h"
+#include  "local.h"
+
+int
+__sread(void *cookie, char *buf, int n)
+{
+  FILE *fp = cookie;
+  int ret;
+
+  _DIAGASSERT(fp != NULL);
+  _DIAGASSERT(buf != NULL);
+
+  ret = (int)read(fp->_file, buf, (size_t)n);
+  /* if the read succeeded, update the current offset */
+  if (ret >= 0)
+    fp->_offset += ret;
+  else
+    fp->_flags &= ~__SOFF;  /* paranoia */
+  return (ret);
+}
+
+int
+__swrite(void *cookie, char const *buf, int n)
+{
+  FILE *fp = cookie;
+
+  _DIAGASSERT(cookie != NULL);
+  _DIAGASSERT(buf != NULL);
+
+  if (fp->_flags & __SAPP)
+    (void) lseek(fp->_file, (off_t)0, SEEK_END);
+  fp->_flags &= ~__SOFF;  /* in case FAPPEND mode is set */
+  return (int)(write(fp->_file, (char *)buf, (size_t)n));
+}
+
+fpos_t
+__sseek(void *cookie, fpos_t offset, int whence)
+{
+  FILE *fp = cookie;
+  off_t ret;
+
+  _DIAGASSERT(fp != NULL);
+
+  ret = lseek(fp->_file, (off_t)offset, whence);
+  if (ret == -1L)
+    fp->_flags &= ~__SOFF;
+  else {
+    fp->_flags |= __SOFF;
+    fp->_offset = ret;
+  }
+  return (ret);
+}
+
+int
+__sclose(void *cookie)
+{
+
+  _DIAGASSERT(cookie != NULL);
+
+  return (close(((FILE *)cookie)->_file));
+}

StdLib/LibC/Stdio/swprintf.c

@@ -0,0 +1,47 @@
+/*-
+ * 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.
+
+  FreeBSD: src/lib/libc/stdio/swprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp
+  NetBSD: swprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+swprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt, ...)
+{
+  int ret;
+  va_list ap;
+
+  va_start(ap, fmt);
+  ret = vswprintf(s, n, fmt, ap);
+  va_end(ap);
+
+  return (ret);
+}

StdLib/LibC/Stdio/swscanf.c

@@ -0,0 +1,47 @@
+/*-
+ * 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.
+
+  FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp
+  NetBSD: swscanf.c,v 1.1 2005/05/14 23:51:02 christos Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <stdarg.h>
+#include  <stdio.h>
+#include  <wchar.h>
+
+int
+swscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, ...)
+{
+  va_list ap;
+  int r;
+
+  va_start(ap, fmt);
+  r = vswscanf(str, fmt, ap);
+  va_end(ap);
+
+  return (r);
+}

StdLib/LibC/Stdio/tempnam.c

@@ -0,0 +1,102 @@
+/*  $NetBSD: tempnam.c,v 1.19 2005/07/27 13:23:07 drochner Exp $  */
+
+/*
+ * Copyright (c) 1988, 1993
+ *  The Regents of the University of California.  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.
+ * 3. 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  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)tempnam.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: tempnam.c,v 1.19 2005/07/27 13:23:07 drochner Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  "namespace.h"
+#include  <sys/param.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <string.h>
+#include  <sys/EfiSysCall.h>
+#include  <paths.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+__warn_references(tempnam,
+    "warning: tempnam() possibly used unsafely, use mkstemp() or mkdtemp()")
+
+static const char *
+trailsl(const char *f)
+{
+  const char *s = f;
+  while (*s)
+    s++;
+  return (f != s && s[-1] == '/') ? "" : "/";
+}
+
+static char *
+gentemp(char *name, size_t len, const char *tmp, const char  *pfx)
+{
+  (void)snprintf(name, len, "%s%s%sXXXX", tmp, trailsl(tmp), pfx);
+  return _mktemp(name);
+}
+
+char *
+tempnam(const char *dir, const char *pfx)
+{
+  int sverrno;
+  char *name, *f;
+  const char *tmp;
+
+  if (!(name = malloc((size_t)MAXPATHLEN)))
+    return NULL;
+
+  if (!pfx)
+    pfx = "tmp.";
+
+  if ((tmp = getenv("TMPDIR")) != NULL &&
+      (f = gentemp(name, (size_t)MAXPATHLEN, tmp, pfx)) != NULL)
+    return f;
+
+  if (dir != NULL &&
+      (f = gentemp(name, (size_t)MAXPATHLEN, dir, pfx)) != NULL)
+    return f;
+
+  //if ((f = gentemp(name, (size_t)MAXPATHLEN, P_tmpdir, pfx)) != NULL)
+  //  return f;
+
+  if ((f = gentemp(name, (size_t)MAXPATHLEN, _PATH_TMP, pfx)) != NULL)
+    return f;
+
+  sverrno = errno;
+  free(name);
+  errno = sverrno;
+  return(NULL);
+}

StdLib/LibC/Stdio/tmpfile.c

@@ -0,0 +1,86 @@
+/*  $NetBSD: tmpfile.c,v 1.11 2003/08/07 16:43:33 agc Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)tmpfile.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: tmpfile.c,v 1.11 2003/08/07 16:43:33 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include  "namespace.h"
+#include  <sys/types.h>
+#include  <sys/EfiSysCall.h>
+#include  <signal.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <string.h>
+#include  <paths.h>
+
+#define TRAILER "tmp.XXXX"
+
+FILE *
+tmpfile()
+{
+  //sigset_t set, oset;
+  FILE *fp;
+  int fd, sverrno;
+  char buf[sizeof(_PATH_TMP) + sizeof(TRAILER)];
+
+  (void)memcpy(buf, _PATH_TMP, sizeof(_PATH_TMP) - 1);
+  (void)memcpy(buf + sizeof(_PATH_TMP) - 1, TRAILER, sizeof(TRAILER));
+
+  //sigfillset(&set);
+  //(void)sigprocmask(SIG_BLOCK, &set, &oset);
+
+  fd = mkstemp(buf);
+  if (fd != -1)
+    (void)unlink(buf);
+
+  //(void)sigprocmask(SIG_SETMASK, &oset, NULL);
+
+  if (fd == -1)
+    return (NULL);
+
+  if ((fp = fdopen(fd, "w+")) == NULL) {
+    sverrno = errno;
+    (void)close(fd);
+    errno = sverrno;
+    return (NULL);
+  }
+  return (fp);
+}

StdLib/LibC/Stdio/tmpnam.c

@@ -0,0 +1,70 @@
+/** @file
+    Implementation of tmpnam as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: tmpnam.c,v 1.14 2003/08/07 16:43:33 agc Exp
+    tmpnam.c  8.3 (Berkeley) 3/28/94
+**/
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  "namespace.h"
+#include  <sys/types.h>
+#include  <paths.h>
+#include  <stdio.h>
+#include  <sys/EfiSysCall.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+__warn_references(tmpnam,"warning: tmpnam() possibly used unsafely, use mkstemp() or mkdtemp()")
+
+char *
+tmpnam(char *s)
+{
+  static long unsigned int tmpcount = 0;  // Must be long to satisfy the %lu in snprintf below.
+  static char buf[L_tmpnam];
+
+  if (s == NULL)
+    s = buf;
+  (void)snprintf(s, L_tmpnam, "%stmp_%lu_XXXX", _PATH_TMP, tmpcount);
+  ++tmpcount;
+  return (_mktemp(s));
+}

StdLib/LibC/Stdio/ungetc.c

@@ -0,0 +1,172 @@
+/** @file
+    Implementation of ungetc as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: ungetc.c,v 1.14 2003/08/07 16:43:34 agc Exp
+    ungetc.c  8.2 (Berkeley) 11/3/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+static int __submore(FILE *);
+/*
+ * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
+ * the buffer moves, so that it points the same distance from the end,
+ * and move the bytes in the buffer around as necessary so that they
+ * are all at the end (stack-style).
+ */
+static int
+__submore(FILE *fp)
+{
+  int i;
+  unsigned char *p;
+
+  _DIAGASSERT(fp != NULL);
+
+  if (_UB(fp)._base == fp->_ubuf) {
+    /*
+     * Get a new buffer (rather than expanding the old one).
+     */
+    if ((p = malloc((size_t)BUFSIZ)) == NULL)
+      return (EOF);
+    _UB(fp)._base = p;
+    _UB(fp)._size = BUFSIZ;
+    p += BUFSIZ - sizeof(fp->_ubuf);
+    for (i = sizeof(fp->_ubuf); --i >= 0;)
+      p[i] = fp->_ubuf[i];
+    fp->_p = p;
+    return (0);
+  }
+  i = _UB(fp)._size;
+  p = realloc(_UB(fp)._base, (size_t)(i << 1));
+  if (p == NULL)
+    return (EOF);
+  /* no overlap (hence can use memcpy) because we doubled the size */
+  (void)memcpy((void *)(p + i), (void *)p, (size_t)i);
+  fp->_p = p + i;
+  _UB(fp)._base = p;
+  _UB(fp)._size = i << 1;
+  return (0);
+}
+
+int
+ungetc(int c, FILE *fp)
+{
+  _DIAGASSERT(fp != NULL);
+
+  if (c == EOF)
+    return (EOF);
+  if (!__sdidinit)
+    __sinit();
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, -1);
+  if ((fp->_flags & __SRD) == 0) {
+    /*
+     * Not already reading: no good unless reading-and-writing.
+     * Otherwise, flush any current write stuff.
+     */
+    if ((fp->_flags & __SRW) == 0) {
+      FUNLOCKFILE(fp);
+      return (EOF);
+    }
+    if (fp->_flags & __SWR) {
+      if (__sflush(fp)) {
+        FUNLOCKFILE(fp);
+        return (EOF);
+      }
+      fp->_flags &= ~__SWR;
+      fp->_w = 0;
+      fp->_lbfsize = 0;
+    }
+    fp->_flags |= __SRD;
+  }
+  c = (unsigned char)c;
+
+  /*
+   * If we are in the middle of ungetc'ing, just continue.
+   * This may require expanding the current ungetc buffer.
+   */
+  if (HASUB(fp)) {
+    if (fp->_r >= _UB(fp)._size && __submore(fp)) {
+      FUNLOCKFILE(fp);
+      return (EOF);
+    }
+    *--fp->_p = (unsigned char)c;
+    fp->_r++;
+    FUNLOCKFILE(fp);
+    return (c);
+  }
+  fp->_flags &= ~__SEOF;
+
+  /*
+   * If we can handle this by simply backing up, do so,
+   * but never replace the original character.
+   * (This makes sscanf() work when scanning `const' data.)
+   */
+  if (fp->_bf._base != NULL && fp->_p > fp->_bf._base &&
+      fp->_p[-1] == c) {
+    fp->_p--;
+    fp->_r++;
+    FUNLOCKFILE(fp);
+    return (c);
+  }
+
+  /*
+   * Create an ungetc buffer.
+   * Initially, we will use the `reserve' buffer.
+   */
+  fp->_ur = fp->_r;
+  fp->_up = fp->_p;
+  _UB(fp)._base = fp->_ubuf;
+  _UB(fp)._size = sizeof(fp->_ubuf);
+  fp->_ubuf[sizeof(fp->_ubuf) - 1] = (unsigned char)c;
+  fp->_p = &fp->_ubuf[sizeof(fp->_ubuf) - 1];
+  fp->_r = 1;
+  FUNLOCKFILE(fp);
+  return (c);
+}

StdLib/LibC/Stdio/ungetwc.c

@@ -0,0 +1,75 @@
+/*-
+ * 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:
+ * 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.
+ *
+ * $Citrus$
+
+  NetBSD: ungetwc.c,v 1.3 2005/06/12 05:21:27 lukem Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <assert.h>
+#include  <errno.h>
+#include  <stdio.h>
+#include  <wchar.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+wint_t
+ungetwc(wint_t wc, FILE *fp)
+{
+  struct wchar_io_data *wcio;
+
+  _DIAGASSERT(fp);
+
+  if (wc == WEOF)
+    return WEOF;
+
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, 1);
+  /*
+   * XXX since we have no way to transform a wchar string to
+   * a char string in reverse order, we can't use ungetc.
+   */
+  /* XXX should we flush ungetc buffer? */
+
+  wcio = WCIO_GET(fp);
+  if (wcio == 0) {
+    FUNLOCKFILE(fp);
+    errno = ENOMEM; /* XXX */
+    return WEOF;
+  }
+
+  if (wcio->wcio_ungetwc_inbuf >= WCIO_UNGETWC_BUFSIZE) {
+    FUNLOCKFILE(fp);
+    return WEOF;
+  }
+
+  wcio->wcio_ungetwc_buf[wcio->wcio_ungetwc_inbuf++] = (wchar_t)wc;
+  __sclearerr(fp);
+  FUNLOCKFILE(fp);
+
+  return wc;
+}

StdLib/LibC/Stdio/vasprintf.c

@@ -0,0 +1,79 @@
+/*  $NetBSD: vasprintf.c,v 1.10 2005/02/09 21:35:47 kleink Exp $  */
+
+/*
+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: vasprintf.c,v 1.10 2005/02/09 21:35:47 kleink Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+vasprintf(str, fmt, ap)
+  char **str;
+  const char *fmt;
+  _BSD_VA_LIST_ ap;
+{
+  int ret;
+  FILE f;
+  struct __sfileext fext;
+  unsigned char *_base;
+
+  _DIAGASSERT(str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR | __SALC;
+  f._bf._base = f._p = (unsigned char *)malloc(128);
+  if (f._bf._base == NULL)
+    goto err;
+  f._bf._size = f._w = 127;   /* Leave room for the NUL */
+  ret = __vfprintf_unlocked(&f, fmt, ap);
+  if (ret == -1)
+    goto err;
+  *f._p = '\0';
+  _base = realloc(f._bf._base, (size_t)(ret + 1));
+  if (_base == NULL)
+    goto err;
+  *str = (char *)_base;
+  return (ret);
+
+err:
+  if (f._bf._base)
+    free(f._bf._base);
+  *str = NULL;
+  errno = ENOMEM;
+  return (-1);
+}

StdLib/LibC/Stdio/vfprintf.c

@@ -0,0 +1,2 @@
+#define NARROW
+#include "vfwprintf.c"

StdLib/LibC/Stdio/vfwscanf.c

@@ -0,0 +1,909 @@
+/*-
+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials are licensed and made available under
+  the terms and conditions of the BSD License that accompanies this distribution.
+  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ * 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.
+
+  FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp
+  NetBSD: vfwscanf.c,v 1.2 2005/06/12 05:48:41 lukem Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  "namespace.h"
+#include  <ctype.h>
+#include  <inttypes.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <stddef.h>
+#include  <stdarg.h>
+#include  <string.h>
+#include  <limits.h>
+#include  <wchar.h>
+#include  <wctype.h>
+
+#include  "reentrant.h"
+#include  "local.h"
+
+#ifndef NO_FLOATING_POINT
+#include  <locale.h>
+#endif
+
+#if defined(_MSC_VER)           /* Handle Microsoft VC++ compiler specifics. */
+  #pragma warning ( disable : 4244 )  // Allow wint_t to wchar_t conversions
+  #pragma warning ( disable : 4305 )  // Allow truncation from UINT64 to void*
+  #pragma warning ( disable : 4701 )  // Disable false warning for local variable p near line 375
+#endif
+
+
+#define BUF   513 /* Maximum length of numeric string. */
+
+/*
+ * Flags used during conversion.
+ */
+#define LONG        0x01    /* l: long or double */
+#define LONGDBL     0x02    /* L: long double */
+#define SHORT       0x04    /* h: short */
+#define SUPPRESS    0x08    /* *: suppress assignment */
+#define POINTER     0x10    /* p: void * (as hex) */
+#define NOSKIP      0x20    /* [ or c: do not skip blanks */
+#define LONGLONG    0x400   /* ll: quad_t (+ deprecated q: quad) */
+#define INTMAXT     0x800   /* j: intmax_t */
+#define PTRDIFFT    0x1000  /* t: ptrdiff_t */
+#define SIZET       0x2000  /* z: size_t */
+#define SHORTSHORT  0x4000  /* hh: char */
+#define UNSIGNED    0x8000  /* %[oupxX] conversions */
+
+/*
+ * The following are used in integral conversions only:
+ * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
+ */
+#define SIGNOK    0x40  /* +/- is (still) legal */
+#define NDIGITS   0x80  /* no digits detected */
+#define PFXOK   0x100 /* 0x prefix is (still) legal */
+#define NZDIGITS  0x200 /* no zero digits detected */
+#define HAVESIGN  0x10000 /* sign detected */
+
+/*
+ * Conversion types.
+ */
+#define CT_CHAR   0 /* %c conversion */
+#define CT_CCL    1 /* %[...] conversion */
+#define CT_STRING 2 /* %s conversion */
+#define CT_INT    3 /* %[dioupxX] conversion */
+#define CT_FLOAT  4 /* %[efgEFG] conversion */
+
+static int parsefloat(FILE *, wchar_t *, wchar_t *);
+
+#define INCCL(_c) \
+  (cclcompl ? (wmemchr(ccls, (_c), (size_t)(ccle - ccls)) == NULL) : \
+  (wmemchr(ccls, (_c), (size_t)(ccle - ccls)) != NULL))
+
+/*
+ * MT-safe version.
+ */
+int
+vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
+{
+  int ret;
+
+  FLOCKFILE(fp);
+  _SET_ORIENTATION(fp, 1);
+  ret = __vfwscanf_unlocked(fp, fmt, ap);
+  FUNLOCKFILE(fp);
+  return (ret);
+}
+
+/*
+ * Non-MT-safe version.
+ */
+int
+__vfwscanf_unlocked(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
+{
+  wint_t c;   /* character from format, or conversion */
+  size_t width;   /* field width, or 0 */
+  wchar_t *p;   /* points into all kinds of strings */
+  int n;      /* handy integer */
+  int flags;    /* flags as defined above */
+  wchar_t *p0;    /* saves original value of p when necessary */
+  int nassigned;    /* number of fields assigned */
+  int nconversions; /* number of conversions */
+  int nread;    /* number of characters consumed from fp */
+  int base;   /* base argument to conversion function */
+  wchar_t buf[BUF]; /* buffer for numeric conversions */
+  const wchar_t *ccls;  /* character class start */
+  const wchar_t *ccle;  /* character class end */
+  int cclcompl;   /* ccl is complemented? */
+  wint_t wi;    /* handy wint_t */
+  char *mbp;    /* multibyte string pointer for %c %s %[ */
+  size_t nconv;   /* number of bytes in mb. conversion */
+  char mbbuf[MB_LEN_MAX]; /* temporary mb. character buffer */
+  static const mbstate_t initial = { 0 };
+  mbstate_t mbs;
+
+  /* `basefix' is used to avoid `if' tests in the integer scanner */
+  static short basefix[17] =
+    { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+
+  nassigned = 0;
+  nconversions = 0;
+  nread = 0;
+  ccls = ccle = NULL;
+  base = 0;
+  cclcompl = 0;
+  mbp = NULL;
+  for (;;) {
+    c = *fmt++;
+    if (c == 0)
+      return (nassigned);
+    if (iswspace(c)) {
+      while ((c = __fgetwc_unlock(fp)) != WEOF &&
+          iswspace(c))
+        ;
+      if (c != WEOF)
+        ungetwc(c, fp);
+      continue;
+    }
+    if (c != '%')
+      goto literal;
+    width = 0;
+    flags = 0;
+    /*
+     * switch on the format.  continue if done;
+     * break once format type is derived.
+     */
+again:    c = *fmt++;
+    switch (c) {
+    case '%':
+literal:
+      if ((wi = __fgetwc_unlock(fp)) == WEOF)
+        goto input_failure;
+      if (wi != c) {
+        ungetwc(wi, fp);
+        goto input_failure;
+      }
+      nread++;
+      continue;
+
+    case '*':
+      flags |= SUPPRESS;
+      goto again;
+    case 'j':
+      flags |= INTMAXT;
+      goto again;
+    case 'l':
+      if (flags & LONG) {
+        flags &= ~LONG;
+        flags |= LONGLONG;
+      } else
+        flags |= LONG;
+      goto again;
+    case 'q':
+      flags |= LONGLONG;  /* not quite */
+      goto again;
+    case 't':
+      flags |= PTRDIFFT;
+      goto again;
+    case 'z':
+      flags |= SIZET;
+      goto again;
+    case 'L':
+      flags |= LONGDBL;
+      goto again;
+    case 'h':
+      if (flags & SHORT) {
+        flags &= ~SHORT;
+        flags |= SHORTSHORT;
+      } else
+        flags |= SHORT;
+      goto again;
+
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+      width = width * 10 + c - '0';
+      goto again;
+
+    /*
+     * Conversions.
+     */
+    case 'd':
+      c = CT_INT;
+      base = 10;
+      break;
+
+    case 'i':
+      c = CT_INT;
+      base = 0;
+      break;
+
+    case 'o':
+      c = CT_INT;
+      flags |= UNSIGNED;
+      base = 8;
+      break;
+
+    case 'u':
+      c = CT_INT;
+      flags |= UNSIGNED;
+      base = 10;
+      break;
+
+    case 'X':
+    case 'x':
+      flags |= PFXOK; /* enable 0x prefixing */
+      c = CT_INT;
+      flags |= UNSIGNED;
+      base = 16;
+      break;
+
+#ifndef NO_FLOATING_POINT
+    //case 'A':
+    case 'E': case 'F': case 'G':
+    //case 'a':
+    case 'e': case 'f': case 'g':
+      c = CT_FLOAT;
+      break;
+#endif
+
+    case 'S':
+      flags |= LONG;
+      /* FALLTHROUGH */
+    case 's':
+      c = CT_STRING;
+      break;
+
+    case '[':
+      ccls = fmt;
+      if (*fmt == '^') {
+        cclcompl = 1;
+        fmt++;
+      } else
+        cclcompl = 0;
+      if (*fmt == ']')
+        fmt++;
+      while (*fmt != '\0' && *fmt != ']')
+        fmt++;
+      ccle = fmt;
+      fmt++;
+      flags |= NOSKIP;
+      c = CT_CCL;
+      break;
+
+    case 'C':
+      flags |= LONG;
+      /* FALLTHROUGH */
+    case 'c':
+      flags |= NOSKIP;
+      c = CT_CHAR;
+      break;
+
+    case 'p': /* pointer format is like hex */
+      flags |= POINTER | PFXOK;
+      c = CT_INT;   /* assumes sizeof(uintmax_t) */
+      flags |= UNSIGNED;  /*      >= sizeof(uintptr_t) */
+      base = 16;
+      break;
+
+    case 'n':
+      nconversions++;
+      if (flags & SUPPRESS) /* ??? */
+        continue;
+      if (flags & SHORTSHORT)
+        *va_arg(ap, char *) = (char)nread;
+      else if (flags & SHORT)
+        *va_arg(ap, short *) = (short)nread;
+      else if (flags & LONG)
+        *va_arg(ap, long *) = (long)nread;
+      else if (flags & LONGLONG)
+        *va_arg(ap, INT64 *) = (INT64)nread;    // was quad_t
+      else if (flags & INTMAXT)
+        *va_arg(ap, intmax_t *) = (intmax_t)nread;
+      else if (flags & SIZET)
+        *va_arg(ap, size_t *) = (size_t)nread;
+      else if (flags & PTRDIFFT)
+        *va_arg(ap, ptrdiff_t *) = (ptrdiff_t)nread;
+      else
+        *va_arg(ap, int *) = nread;
+      continue;
+
+    default:
+      goto match_failure;
+
+    /*
+     * Disgusting backwards compatibility hack. XXX
+     */
+    case '\0':  /* compat */
+      return (EOF);
+    }
+
+    /*
+     * Consume leading white space, except for formats
+     * that suppress this.
+     */
+    if ((flags & NOSKIP) == 0) {
+      while ((wi = __fgetwc_unlock(fp)) != WEOF && iswspace(wi))
+        nread++;
+      if (wi == WEOF)
+        goto input_failure;
+      ungetwc(wi, fp);
+    }
+
+    /*
+     * Do the conversion.
+     */
+    switch (c) {
+
+    case CT_CHAR:
+      /* scan arbitrary characters (sets NOSKIP) */
+      if (width == 0)
+        width = 1;
+      if (flags & LONG) {
+        if (!(flags & SUPPRESS))
+          p = va_arg(ap, wchar_t *);
+        n = 0;
+        while (width-- != 0 &&
+            (wi = __fgetwc_unlock(fp)) != WEOF) {
+          if (!(flags & SUPPRESS))
+            *p++ = (wchar_t)wi;
+          n++;
+        }
+        if (n == 0)
+          goto input_failure;
+        nread += n;
+        if (!(flags & SUPPRESS))
+          nassigned++;
+      } else {
+        if (!(flags & SUPPRESS))
+          mbp = va_arg(ap, char *);
+        n = 0;
+        mbs = initial;
+        while (width != 0 &&
+            (wi = __fgetwc_unlock(fp)) != WEOF) {
+          if (width >= MB_CUR_MAX &&
+              !(flags & SUPPRESS)) {
+            nconv = wcrtomb(mbp, (wchar_t)wi, &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+          } else {
+            nconv = wcrtomb(mbbuf, (wchar_t)wi,
+                &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+            if (nconv > width) {
+              ungetwc(wi, fp);
+              break;
+            }
+            if (!(flags & SUPPRESS))
+              memcpy(mbp, mbbuf,
+                  nconv);
+          }
+          if (!(flags & SUPPRESS))
+            mbp += nconv;
+          width -= nconv;
+          n++;
+        }
+        if (n == 0)
+          goto input_failure;
+        nread += n;
+        if (!(flags & SUPPRESS))
+          nassigned++;
+      }
+      nconversions++;
+      break;
+
+    case CT_CCL:
+      /* scan a (nonempty) character class (sets NOSKIP) */
+      if (width == 0)
+        width = (size_t)~0; /* `infinity' */
+      /* take only those things in the class */
+      if ((flags & SUPPRESS) && (flags & LONG)) {
+        n = 0;
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width-- != 0 && INCCL(wi))
+          n++;
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+        if (n == 0)
+          goto match_failure;
+      } else if (flags & LONG) {
+        p0 = p = va_arg(ap, wchar_t *);
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width-- != 0 && INCCL(wi))
+          *p++ = (wchar_t)wi;
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+        n = p - p0;
+        if (n == 0)
+          goto match_failure;
+        *p = 0;
+        nassigned++;
+      } else {
+        if (!(flags & SUPPRESS))
+          mbp = va_arg(ap, char *);
+        n = 0;
+        mbs = initial;
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width != 0 && INCCL(wi)) {
+          if (width >= MB_CUR_MAX &&
+             !(flags & SUPPRESS)) {
+            nconv = wcrtomb(mbp, wi, &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+          } else {
+            nconv = wcrtomb(mbbuf, wi,
+                &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+            if (nconv > width)
+              break;
+            if (!(flags & SUPPRESS))
+              memcpy(mbp, mbbuf,
+                  nconv);
+          }
+          if (!(flags & SUPPRESS))
+            mbp += nconv;
+          width -= nconv;
+          n++;
+        }
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+        if (!(flags & SUPPRESS)) {
+          *mbp = 0;
+          nassigned++;
+        }
+      }
+      nread += n;
+      nconversions++;
+      break;
+
+    case CT_STRING:
+      /* like CCL, but zero-length string OK, & no NOSKIP */
+      if (width == 0)
+        width = (size_t)~0;
+      if ((flags & SUPPRESS) && (flags & LONG)) {
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width-- != 0 &&
+            !iswspace(wi))
+          nread++;
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+      } else if (flags & LONG) {
+        p0 = p = va_arg(ap, wchar_t *);
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width-- != 0 &&
+            !iswspace(wi)) {
+          *p++ = (wchar_t)wi;
+          nread++;
+        }
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+        *p = '\0';
+        nassigned++;
+      } else {
+        if (!(flags & SUPPRESS))
+          mbp = va_arg(ap, char *);
+        mbs = initial;
+        while ((wi = __fgetwc_unlock(fp)) != WEOF &&
+            width != 0 &&
+            !iswspace(wi)) {
+          if (width >= MB_CUR_MAX &&
+              !(flags & SUPPRESS)) {
+            nconv = wcrtomb(mbp, wi, &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+          } else {
+            nconv = wcrtomb(mbbuf, wi,
+                &mbs);
+            if (nconv == (size_t)-1)
+              goto input_failure;
+            if (nconv > width)
+              break;
+            if (!(flags & SUPPRESS))
+              memcpy(mbp, mbbuf,
+                  nconv);
+          }
+          if (!(flags & SUPPRESS))
+            mbp += nconv;
+          width -= nconv;
+          nread++;
+        }
+        if (wi != WEOF)
+          ungetwc(wi, fp);
+        if (!(flags & SUPPRESS)) {
+          *mbp = 0;
+          nassigned++;
+        }
+      }
+      nconversions++;
+      continue;
+
+    case CT_INT:
+      /* scan an integer as if by the conversion function */
+      if (width == 0 || width > sizeof(buf) /
+          sizeof(*buf) - 1)
+        width = sizeof(buf) / sizeof(*buf) - 1;
+      flags |= SIGNOK | NDIGITS | NZDIGITS;
+      for (p = buf; width; width--) {
+        c = __fgetwc_unlock(fp);
+        /*
+         * Switch on the character; `goto ok'
+         * if we accept it as a part of number.
+         */
+        switch (c) {
+
+        /*
+         * The digit 0 is always legal, but is
+         * special.  For %i conversions, if no
+         * digits (zero or nonzero) have been
+         * scanned (only signs), we will have
+         * base==0.  In that case, we should set
+         * it to 8 and enable 0x prefixing.
+         * Also, if we have not scanned zero digits
+         * before this, do not turn off prefixing
+         * (someone else will turn it off if we
+         * have scanned any nonzero digits).
+         */
+        case '0':
+          if (base == 0) {
+            base = 8;
+            flags |= PFXOK;
+          }
+          if (flags & NZDIGITS)
+              flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
+          else
+              flags &= ~(SIGNOK|PFXOK|NDIGITS);
+          goto ok;
+
+        /* 1 through 7 always legal */
+        case '1': case '2': case '3':
+        case '4': case '5': case '6': case '7':
+          base = basefix[base];
+          flags &= ~(SIGNOK | PFXOK | NDIGITS);
+          goto ok;
+
+        /* digits 8 and 9 ok iff decimal or hex */
+        case '8': case '9':
+          base = basefix[base];
+          if (base <= 8)
+            break;  /* not legal here */
+          flags &= ~(SIGNOK | PFXOK | NDIGITS);
+          goto ok;
+
+        /* letters ok iff hex */
+        case 'A': case 'B': case 'C':
+        case 'D': case 'E': case 'F':
+        case 'a': case 'b': case 'c':
+        case 'd': case 'e': case 'f':
+          /* no need to fix base here */
+          if (base <= 10)
+            break;  /* not legal here */
+          flags &= ~(SIGNOK | PFXOK | NDIGITS);
+          goto ok;
+
+        /* sign ok only as first character */
+        case '+': case '-':
+          if (flags & SIGNOK) {
+            flags &= ~SIGNOK;
+            flags |= HAVESIGN;
+            goto ok;
+          }
+          break;
+
+        /*
+         * x ok iff flag still set & 2nd char (or
+         * 3rd char if we have a sign).
+         */
+        case 'x': case 'X':
+          if (flags & PFXOK && p ==
+              buf + 1 + !!(flags & HAVESIGN)) {
+            base = 16;  /* if %i */
+            flags &= ~PFXOK;
+            goto ok;
+          }
+          break;
+        }
+
+        /*
+         * If we got here, c is not a legal character
+         * for a number.  Stop accumulating digits.
+         */
+        if (c != WEOF)
+          ungetwc(c, fp);
+        break;
+    ok:
+        /*
+         * c is legal: store it and look at the next.
+         */
+        *p++ = (wchar_t)c;
+      }
+      /*
+       * If we had only a sign, it is no good; push
+       * back the sign.  If the number ends in `x',
+       * it was [sign] '0' 'x', so push back the x
+       * and treat it as [sign] '0'.
+       */
+      if (flags & NDIGITS) {
+        if (p > buf)
+          ungetwc(*--p, fp);
+        goto match_failure;
+      }
+      c = p[-1];
+      if (c == 'x' || c == 'X') {
+        --p;
+        ungetwc(c, fp);
+      }
+      if ((flags & SUPPRESS) == 0) {
+        uintmax_t res;
+
+        *p = 0;
+        if ((flags & UNSIGNED) == 0)
+            res = wcstoimax(buf, NULL, base);
+        else
+            res = wcstoumax(buf, NULL, base);
+
+        if (flags & POINTER) {
+          *va_arg(ap, void **) = (void *)res;
+        }
+        else if (flags & SHORTSHORT) {
+          *va_arg(ap, char *) = (char)res;
+        }
+        else if (flags & SHORT) {
+          *va_arg(ap, short *) = (short)res;
+        }
+        else if (flags & LONG) {
+          *va_arg(ap, long *) = (long)res;
+        }
+        else if (flags & LONGLONG) {
+          *va_arg(ap, INT64 *) = res;   // was quad_t
+        }
+        else if (flags & INTMAXT) {
+          *va_arg(ap, intmax_t *) = res;
+        }
+        else if (flags & PTRDIFFT) {
+          *va_arg(ap, ptrdiff_t *) = (ptrdiff_t)res;
+        }
+        else if (flags & SIZET) {
+          *va_arg(ap, size_t *) = (size_t)res;
+        }
+        else {
+          *va_arg(ap, int *) = (int)res;
+        }
+        nassigned++;
+      }
+      nread += p - buf;
+      nconversions++;
+      break;
+
+#ifndef NO_FLOATING_POINT
+    case CT_FLOAT:
+      /* scan a floating point number as if by strtod */
+      if (width == 0 || width > sizeof(buf) /
+          sizeof(*buf) - 1)
+        width = sizeof(buf) / sizeof(*buf) - 1;
+      if ((width = parsefloat(fp, buf, buf + width)) == 0)
+        goto match_failure;
+      if ((flags & SUPPRESS) == 0) {
+#ifdef notyet
+        if (flags & LONGDBL) {
+          long double res = wcstold(buf, &p);
+          *va_arg(ap, long double *) = res;
+        } else
+#endif
+        if (flags & LONG) {
+          double res = wcstod(buf, &p);
+          *va_arg(ap, double *) = res;
+#ifdef notyet
+        } else {
+          float res = wcstof(buf, &p);
+          *va_arg(ap, float *) = res;
+#endif
+        }
+#ifdef DEBUG
+        if (p - buf != width)
+          abort();
+#endif
+        nassigned++;
+      }
+      nread += (int)width;
+      nconversions++;
+      break;
+#endif /* !NO_FLOATING_POINT */
+    }
+  }
+input_failure:
+  return (nconversions != 0 ? nassigned : EOF);
+match_failure:
+  return (nassigned);
+}
+
+#ifndef NO_FLOATING_POINT
+static int
+parsefloat(FILE *fp, wchar_t *buf, wchar_t *end)
+{
+  wchar_t *commit, *p;
+  int infnanpos = 0;
+  enum {
+    S_START, S_GOTSIGN, S_INF, S_NAN, S_MAYBEHEX,
+    S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
+  } state = S_START;
+  wchar_t c;
+  wchar_t decpt = (wchar_t)(unsigned char)*localeconv()->decimal_point;
+  int gotmantdig = 0, ishex = 0;
+
+  /*
+   * We set commit = p whenever the string we have read so far
+   * constitutes a valid representation of a floating point
+   * number by itself.  At some point, the parse will complete
+   * or fail, and we will ungetc() back to the last commit point.
+   * To ensure that the file offset gets updated properly, it is
+   * always necessary to read at least one character that doesn't
+   * match; thus, we can't short-circuit "infinity" or "nan(...)".
+   */
+  commit = buf - 1;
+  c = (wchar_t)WEOF;
+  for (p = buf; p < end; ) {
+    if ((wint_t)(c = __fgetwc_unlock(fp)) == WEOF)
+      break;
+reswitch:
+    switch (state) {
+    case S_START:
+      state = S_GOTSIGN;
+      if (c == '-' || c == '+')
+        break;
+      else
+        goto reswitch;
+    case S_GOTSIGN:
+      switch (c) {
+      case '0':
+        state = S_MAYBEHEX;
+        commit = p;
+        break;
+      case 'I':
+      case 'i':
+        state = S_INF;
+        break;
+      case 'N':
+      case 'n':
+        state = S_NAN;
+        break;
+      default:
+        state = S_DIGITS;
+        goto reswitch;
+      }
+      break;
+    case S_INF:
+      if (infnanpos > 6 ||
+          (c != "nfinity"[infnanpos] &&
+           c != "NFINITY"[infnanpos]))
+        goto parsedone;
+      if (infnanpos == 1 || infnanpos == 6)
+        commit = p; /* inf or infinity */
+      infnanpos++;
+      break;
+    case S_NAN:
+      switch (infnanpos) {
+      case -1:  /* XXX kludge to deal with nan(...) */
+        goto parsedone;
+      case 0:
+        if (c != 'A' && c != 'a')
+          goto parsedone;
+        break;
+      case 1:
+        if (c != 'N' && c != 'n')
+          goto parsedone;
+        else
+          commit = p;
+        break;
+      case 2:
+        if (c != '(')
+          goto parsedone;
+        break;
+      default:
+        if (c == ')') {
+          commit = p;
+          infnanpos = -2;
+        } else if (!iswalnum(c) && c != '_')
+          goto parsedone;
+        break;
+      }
+      infnanpos++;
+      break;
+    case S_MAYBEHEX:
+      state = S_DIGITS;
+      if (c == 'X' || c == 'x') {
+        ishex = 1;
+        break;
+      } else {  /* we saw a '0', but no 'x' */
+        gotmantdig = 1;
+        goto reswitch;
+      }
+    case S_DIGITS:
+      if ((ishex && iswxdigit(c)) || iswdigit(c))
+        gotmantdig = 1;
+      else {
+        state = S_FRAC;
+        if (c != decpt)
+          goto reswitch;
+      }
+      if (gotmantdig)
+        commit = p;
+      break;
+    case S_FRAC:
+      if (((c == 'E' || c == 'e') && !ishex) ||
+          ((c == 'P' || c == 'p') && ishex)) {
+        if (!gotmantdig)
+          goto parsedone;
+        else
+          state = S_EXP;
+      } else if ((ishex && iswxdigit(c)) || iswdigit(c)) {
+        commit = p;
+        gotmantdig = 1;
+      } else
+        goto parsedone;
+      break;
+    case S_EXP:
+      state = S_EXPDIGITS;
+      if (c == '-' || c == '+')
+        break;
+      else
+        goto reswitch;
+    case S_EXPDIGITS:
+      if (iswdigit(c))
+        commit = p;
+      else
+        goto parsedone;
+      break;
+    default:
+      abort();
+    }
+    *p++ = c;
+    c = (wchar_t)WEOF;
+  }
+
+parsedone:
+  if ((wint_t)c != WEOF)
+    ungetwc(c, fp);
+  while (commit < --p)
+    ungetwc(*p, fp);
+  *++commit = '\0';
+  return (commit - buf);
+}
+#endif

StdLib/LibC/Stdio/vprintf.c

@@ -0,0 +1,58 @@
+/** @file
+    Implementation of vprintf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: vprintf.c,v 1.10 2003/08/07 16:43:34 agc Exp
+    vprintf.c 8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+int
+vprintf(char const *fmt, _BSD_VA_LIST_ ap)
+{
+  _DIAGASSERT(fmt != NULL);
+
+  return (vfprintf(stdout, fmt, ap));
+}

StdLib/LibC/Stdio/vscanf.c

@@ -0,0 +1,60 @@
+/*  $NetBSD: vscanf.c,v 1.12 2003/08/07 16:43:35 agc Exp $  */
+
+/*-
+ * Copyright (c) 1990, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Donn Seeley at UUNET Technologies, Inc.
+ *
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)vscanf.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: vscanf.c,v 1.12 2003/08/07 16:43:35 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "reentrant.h"
+#include "local.h"
+
+int
+vscanf(fmt, ap)
+  const char *fmt;
+  _BSD_VA_LIST_ ap;
+{
+
+  _DIAGASSERT(fmt != NULL);
+
+  return (__svfscanf(stdin, fmt, ap));
+}

StdLib/LibC/Stdio/vsnprintf.c

@@ -0,0 +1,89 @@
+/*  $NetBSD: vsnprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: vsnprintf.c,v 1.20 2005/02/09 21:35:47 kleink Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(vsnprintf,_vsnprintf)
+#endif
+
+int
+vsnprintf(str, n, fmt, ap)
+  char *str;
+  size_t n;
+  const char *fmt;
+  _BSD_VA_LIST_ ap;
+{
+  int ret;
+  FILE f;
+  struct __sfileext fext;
+  unsigned char dummy[1];
+
+  _DIAGASSERT(n == 0 || str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  if ((int)n < 0) {
+    errno = EINVAL;
+    return (-1);
+  }
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR;
+  if (n == 0) {
+    f._bf._base = f._p = dummy;
+    f._bf._size = f._w = 0;
+  } else {
+    f._bf._base = f._p = (unsigned char *)str;
+    f._bf._size = f._w = n - 1;
+  }
+  ret = __vfprintf_unlocked(&f, fmt, ap);
+  *f._p = 0;
+  return (ret);
+}

StdLib/LibC/Stdio/vsnprintf_ss.c

@@ -0,0 +1,494 @@
+/*  $NetBSD: vsnprintf_ss.c,v 1.2.2.1 2007/05/07 19:49:09 pavel Exp $ */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: vsnprintf_ss.c,v 1.2.2.1 2007/05/07 19:49:09 pavel Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <sys/types.h>
+#include <inttypes.h>
+#include <assert.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
+#include "reentrant.h"
+#include "extern.h"
+#include "local.h"
+
+#ifdef __weak_alias
+__weak_alias(vsnprintf_ss,_vsnprintf_ss)
+#endif
+
+/*
+ * vsnprintf_ss: scaled down version of printf(3).
+ *
+ * this version based on vfprintf() from libc which was derived from
+ * software contributed to Berkeley by Chris Torek.
+ *
+ */
+
+/*
+ * macros for converting digits to letters and vice versa
+ */
+#define to_digit(c) ((c) - '0')
+#define is_digit(c) ((unsigned)to_digit(c) <= 9)
+#define to_char(n)  (char)((n) + '0')
+
+/*
+ * flags used during conversion.
+ */
+#define ALT   0x001   /* alternate form */
+#define HEXPREFIX 0x002   /* add 0x or 0X prefix */
+#define LADJUST   0x004   /* left adjustment */
+#define LONGDBL   0x008   /* long double; unimplemented */
+#define LONGINT   0x010   /* long integer */
+#define QUADINT   0x020   /* quad integer */
+#define SHORTINT  0x040   /* short integer */
+#define MAXINT    0x080   /* intmax_t */
+#define PTRINT    0x100   /* intptr_t */
+#define SIZEINT   0x200   /* size_t */
+#define ZEROPAD   0x400   /* zero (as opposed to blank) pad */
+#define FPT   0x800   /* Floating point number */
+
+  /*
+   * To extend shorts properly, we need both signed and unsigned
+   * argument extraction methods.
+   */
+#define SARG() \
+  ((INT64)(flags&MAXINT ? va_arg(ap, intmax_t) : \
+      flags&PTRINT ? va_arg(ap, intptr_t) : \
+      flags&SIZEINT ? va_arg(ap, ssize_t) : /* XXX */ \
+      flags&QUADINT ? va_arg(ap, quad_t) : \
+      flags&LONGINT ? va_arg(ap, long) : \
+      flags&SHORTINT ? (short)va_arg(ap, int) : \
+      va_arg(ap, int)))
+
+#define UARG() \
+  ((UINT64)(flags&MAXINT ? va_arg(ap, uintmax_t) : \
+      flags&PTRINT ? va_arg(ap, uintptr_t) : \
+      flags&SIZEINT ? va_arg(ap, size_t) : \
+      flags&QUADINT ? va_arg(ap, u_quad_t) : \
+      flags&LONGINT ? va_arg(ap, unsigned long) : \
+      flags&SHORTINT ? (u_short)va_arg(ap, int) : \
+      va_arg(ap, u_int)))
+
+#define PUTCHAR(C) do {         \
+  if (sbuf < tailp)       \
+    *sbuf++ = (C);        \
+} while (/*CONSTCOND*/0)
+
+int
+vsnprintf_ss(char *sbuf, size_t slen, const char *fmt0, _BSD_VA_LIST_ ap)
+{
+  const char *fmt;  /* format string */
+  int ch;     /* character from fmt */
+  int n;      /* handy integer (short term usage) */
+  char *cp;   /* handy char pointer (short term usage) */
+  int flags;    /* flags as above */
+  int ret;    /* return value accumulator */
+  int width;    /* width from format (%8d), or 0 */
+  int prec;   /* precision from format (%.3d), or -1 */
+  char sign;    /* sign prefix (' ', '+', '-', or \0) */
+
+  u_quad_t _uquad;  /* integer arguments %[diouxX] */
+  enum { OCT, DEC, HEX } base;/* base for [diouxX] conversion */
+  int dprec;    /* a copy of prec if [diouxX], 0 otherwise */
+  int realsz;   /* field size expanded by dprec */
+  int size;   /* size of converted field or string */
+  const char *xdigs;  /* digits for [xX] conversion */
+  char bf[128];     /* space for %c, %[diouxX] */
+  char *tailp;    /* tail pointer for snprintf */
+
+  static const char xdigs_lower[16] = "0123456789abcdef";
+  static const char xdigs_upper[16] = "0123456789ABCDEF";
+
+
+  _DIAGASSERT(n == 0 || sbuf != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  tailp = sbuf + slen;
+
+  cp = NULL;  /* XXX: shutup gcc */
+  size = 0; /* XXX: shutup gcc */
+
+  fmt = fmt0;
+  ret = 0;
+
+  xdigs = NULL;   /* XXX: shut up gcc warning */
+
+  /*
+   * Scan the format for conversions (`%' character).
+   */
+  for (;;) {
+    while (*fmt != '%' && *fmt) {
+      ret++;
+      PUTCHAR(*fmt++);
+    }
+    if (*fmt == 0)
+      goto done;
+
+    fmt++;    /* skip over '%' */
+
+    flags = 0;
+    dprec = 0;
+    width = 0;
+    prec = -1;
+    sign = '\0';
+
+rflag:    ch = *fmt++;
+reswitch: switch (ch) {
+    case ' ':
+      /*
+       * ``If the space and + flags both appear, the space
+       * flag will be ignored.''
+       *  -- ANSI X3J11
+       */
+      if (!sign)
+        sign = ' ';
+      goto rflag;
+    case '#':
+      flags |= ALT;
+      goto rflag;
+    case '*':
+      /*
+       * ``A negative field width argument is taken as a
+       * - flag followed by a positive field width.''
+       *  -- ANSI X3J11
+       * They don't exclude field widths read from args.
+       */
+      if ((width = va_arg(ap, int)) >= 0)
+        goto rflag;
+      width = -width;
+      /* FALLTHROUGH */
+    case '-':
+      flags |= LADJUST;
+      goto rflag;
+    case '+':
+      sign = '+';
+      goto rflag;
+    case '.':
+      if ((ch = *fmt++) == '*') {
+        n = va_arg(ap, int);
+        prec = n < 0 ? -1 : n;
+        goto rflag;
+      }
+      n = 0;
+      while (is_digit(ch)) {
+        n = 10 * n + to_digit(ch);
+        ch = *fmt++;
+      }
+      prec = n < 0 ? -1 : n;
+      goto reswitch;
+    case '0':
+      /*
+       * ``Note that 0 is taken as a flag, not as the
+       * beginning of a field width.''
+       *  -- ANSI X3J11
+       */
+      flags |= ZEROPAD;
+      goto rflag;
+    case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+      n = 0;
+      do {
+        n = 10 * n + to_digit(ch);
+        ch = *fmt++;
+      } while (is_digit(ch));
+      width = n;
+      goto reswitch;
+    case 'h':
+      flags |= SHORTINT;
+      goto rflag;
+    case 'j':
+      flags |= MAXINT;
+      goto rflag;
+    case 'l':
+      if (*fmt == 'l') {
+        fmt++;
+        flags |= QUADINT;
+      } else {
+        flags |= LONGINT;
+      }
+      goto rflag;
+    case 'q':
+      flags |= QUADINT;
+      goto rflag;
+    case 't':
+      flags |= PTRINT;
+      goto rflag;
+    case 'z':
+      flags |= SIZEINT;
+      goto rflag;
+    case 'c':
+      *(cp = bf) = va_arg(ap, int);
+      size = 1;
+      sign = '\0';
+      break;
+    case 'D':
+      flags |= LONGINT;
+      /*FALLTHROUGH*/
+    case 'd':
+    case 'i':
+      _uquad = SARG();
+      if ((quad_t)_uquad < 0) {
+        _uquad = -_uquad;
+        sign = '-';
+      }
+      base = DEC;
+      goto number;
+    case 'n':
+      if (flags & MAXINT)
+        *va_arg(ap, intmax_t *) = ret;
+      else if (flags & PTRINT)
+        *va_arg(ap, intptr_t *) = ret;
+      else if (flags & SIZEINT)
+        *va_arg(ap, ssize_t *) = ret;
+      else if (flags & QUADINT)
+        *va_arg(ap, quad_t *) = ret;
+      else if (flags & LONGINT)
+        *va_arg(ap, long *) = (long)ret;
+      else if (flags & SHORTINT)
+        *va_arg(ap, short *) = (short)ret;
+      else
+        *va_arg(ap, int *) = ret;
+      continue; /* no output */
+    case 'O':
+      flags |= LONGINT;
+      /*FALLTHROUGH*/
+    case 'o':
+      _uquad = UARG();
+      base = OCT;
+      goto nosign;
+    case 'p':
+      /*
+       * ``The argument shall be a pointer to void.  The
+       * value of the pointer is converted to a sequence
+       * of printable characters, in an implementation-
+       * defined manner.''
+       *  -- ANSI X3J11
+       */
+      /* NOSTRICT */
+      _uquad = (u_long)va_arg(ap, void *);
+      base = HEX;
+      xdigs = xdigs_lower;
+      flags |= HEXPREFIX;
+      ch = 'x';
+      goto nosign;
+    case 's':
+      if ((cp = va_arg(ap, char *)) == NULL)
+        /*XXXUNCONST*/
+        cp = __UNCONST("(null)");
+      if (prec >= 0) {
+        /*
+         * can't use strlen; can only look for the
+         * NUL in the first `prec' characters, and
+         * strlen() will go further.
+         */
+        char *p = memchr(cp, 0, (size_t)prec);
+
+        if (p != NULL) {
+          size = p - cp;
+          if (size > prec)
+            size = prec;
+        } else
+          size = prec;
+      } else
+        size = strlen(cp);
+      sign = '\0';
+      break;
+    case 'U':
+      flags |= LONGINT;
+      /*FALLTHROUGH*/
+    case 'u':
+      _uquad = UARG();
+      base = DEC;
+      goto nosign;
+    case 'X':
+      xdigs = xdigs_upper;
+      goto hex;
+    case 'x':
+      xdigs = xdigs_lower;
+hex:      _uquad = UARG();
+      base = HEX;
+      /* leading 0x/X only if non-zero */
+      if (flags & ALT && _uquad != 0)
+        flags |= HEXPREFIX;
+
+      /* unsigned conversions */
+nosign:     sign = '\0';
+      /*
+       * ``... diouXx conversions ... if a precision is
+       * specified, the 0 flag will be ignored.''
+       *  -- ANSI X3J11
+       */
+number:     if ((dprec = prec) >= 0)
+        flags &= ~ZEROPAD;
+
+      /*
+       * ``The result of converting a zero value with an
+       * explicit precision of zero is no characters.''
+       *  -- ANSI X3J11
+       */
+      cp = bf + sizeof(bf);
+      if (_uquad != 0 || prec != 0) {
+        /*
+         * Unsigned mod is hard, and unsigned mod
+         * by a constant is easier than that by
+         * a variable; hence this switch.
+         */
+        switch (base) {
+        case OCT:
+          do {
+            *--cp = to_char(_uquad & 7);
+            _uquad >>= 3;
+          } while (_uquad);
+          /* handle octal leading 0 */
+          if (flags & ALT && *cp != '0')
+            *--cp = '0';
+          break;
+
+        case DEC:
+          /* many numbers are 1 digit */
+          while (_uquad >= 10) {
+            *--cp = to_char(_uquad % 10);
+            _uquad /= 10;
+          }
+          *--cp = to_char(_uquad);
+          break;
+
+        case HEX:
+          do {
+            *--cp = xdigs[(size_t)_uquad & 15];
+            _uquad >>= 4;
+          } while (_uquad);
+          break;
+
+        default:
+          /*XXXUNCONST*/
+          cp = __UNCONST("bug bad base");
+          size = strlen(cp);
+          goto skipsize;
+        }
+      }
+      size = bf + sizeof(bf) - cp;
+    skipsize:
+      break;
+    default:  /* "%?" prints ?, unless ? is NUL */
+      if (ch == '\0')
+        goto done;
+      /* pretend it was %c with argument ch */
+      cp = bf;
+      *cp = ch;
+      size = 1;
+      sign = '\0';
+      break;
+    }
+
+    /*
+     * All reasonable formats wind up here.  At this point, `cp'
+     * points to a string which (if not flags&LADJUST) should be
+     * padded out to `width' places.  If flags&ZEROPAD, it should
+     * first be prefixed by any sign or other prefix; otherwise,
+     * it should be blank padded before the prefix is emitted.
+     * After any left-hand padding and prefixing, emit zeroes
+     * required by a decimal [diouxX] precision, then print the
+     * string proper, then emit zeroes required by any leftover
+     * floating precision; finally, if LADJUST, pad with blanks.
+     *
+     * Compute actual size, so we know how much to pad.
+     * size excludes decimal prec; realsz includes it.
+     */
+    realsz = dprec > size ? dprec : size;
+    if (sign)
+      realsz++;
+    else if (flags & HEXPREFIX)
+      realsz+= 2;
+
+    /* adjust ret */
+    ret += width > realsz ? width : realsz;
+
+    /* right-adjusting blank padding */
+    if ((flags & (LADJUST|ZEROPAD)) == 0) {
+      n = width - realsz;
+      while (n-- > 0)
+        PUTCHAR(' ');
+    }
+
+    /* prefix */
+    if (sign) {
+      PUTCHAR(sign);
+    } else if (flags & HEXPREFIX) {
+      PUTCHAR('0');
+      PUTCHAR(ch);
+    }
+
+    /* right-adjusting zero padding */
+    if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD) {
+      n = width - realsz;
+      while (n-- > 0)
+        PUTCHAR('0');
+    }
+
+    /* leading zeroes from decimal precision */
+    n = dprec - size;
+    while (n-- > 0)
+      PUTCHAR('0');
+
+    /* the string or number proper */
+    while (size--)
+      PUTCHAR(*cp++);
+    /* left-adjusting padding (always blank) */
+    if (flags & LADJUST) {
+      n = width - realsz;
+      while (n-- > 0)
+        PUTCHAR(' ');
+    }
+  }
+
+done:
+  if (sbuf == tailp)
+    sbuf[-1] = '\0';
+  else
+    *sbuf = '\0';
+  return (ret);
+  /* NOTREACHED */
+}

StdLib/LibC/Stdio/vsprintf.c

@@ -0,0 +1,74 @@
+/** @file
+    Implementation of vsprintf as declared in <stdio.h>.
+
+    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    This program and the accompanying materials are licensed and made available
+    under the terms and conditions of the BSD License that accompanies this
+    distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php.
+
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+    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:
+      - 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.
+      - 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 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 HOLDERS 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.
+
+    NetBSD: vsprintf.c,v 1.14 2005/02/09 21:35:47 kleink Exp
+    vsprintf.c  8.1 (Berkeley) 6/4/93
+**/
+#include  <LibConfig.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+int
+vsprintf(char *str, const char *fmt, _BSD_VA_LIST_ ap)
+{
+  int ret;
+  FILE f;
+  struct __sfileext fext;
+
+  _DIAGASSERT(str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR;
+  f._bf._base = f._p = (unsigned char *)str;
+  f._bf._size = f._w = INT_MAX;
+  ret = __vfprintf_unlocked(&f, fmt, ap);
+  *f._p = 0;
+
+  return (ret);
+}

StdLib/LibC/Stdio/vsscanf.c

@@ -0,0 +1,83 @@
+/*  $NetBSD: vsscanf.c,v 1.14 2005/11/29 03:12:00 christos Exp $  */
+
+/*-
+ * Copyright (c) 1990, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Donn Seeley at UUNET Technologies, Inc.
+ *
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: vsscanf.c,v 1.14 2005/11/29 03:12:00 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include "reentrant.h"
+#include "local.h"
+
+static int eofread __P((void *, char *, int));
+
+/* ARGSUSED */
+static int
+eofread(cookie, buf, len)
+  void *cookie;
+  char *buf;
+  int len;
+{
+  return (0);
+}
+
+int
+vsscanf(str, fmt, ap)
+  const char *str;
+  const char *fmt;
+  _BSD_VA_LIST_ ap;
+{
+  FILE f;
+  struct __sfileext fext;
+
+  _DIAGASSERT(str != NULL);
+  _DIAGASSERT(fmt != NULL);
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._flags = __SRD;
+  f._bf._base = f._p = __UNCONST(str);
+  f._bf._size = f._r = strlen(str);
+  f._read = eofread;
+  _UB(&f)._base = NULL;
+  f._lb._base = NULL;
+  return (__svfscanf_unlocked(&f, fmt, ap));
+}

StdLib/LibC/Stdio/vswprintf.c

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 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.
+
+  FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.6 2005/02/21 19:41:44 fjoe Exp
+  NetBSD: vswprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <errno.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <wchar.h>
+#include  <stdarg.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+int
+vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
+    va_list ap)
+{
+  static const mbstate_t initial = { 0 };
+  mbstate_t mbs;
+  FILE f;
+  char *mbp;
+  int ret, sverrno;
+  size_t nwc;
+  struct __sfileext fext;
+
+  if (n == 0) {
+    errno = EINVAL;
+    return (-1);
+  }
+
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SWR | __SSTR | __SALC;
+  f._bf._base = f._p = (unsigned char *)malloc(128);
+  if (f._bf._base == NULL) {
+    errno = ENOMEM;
+    return (-1);
+  }
+  f._bf._size = f._w = 127;   /* Leave room for the NUL */
+  ret = __vfwprintf_unlocked(&f, fmt, ap);
+  if (ret < 0) {
+    sverrno = errno;
+    free(f._bf._base);
+    errno = sverrno;
+    return (-1);
+  }
+  *f._p = '\0';
+  mbp = (char *)f._bf._base;
+  /*
+   * XXX Undo the conversion from wide characters to multibyte that
+   * fputwc() did in __vfwprintf().
+   */
+  mbs = initial;
+  nwc = mbsrtowcs(s, (const char **)&mbp, n, &mbs);
+  free(f._bf._base);
+  if (nwc == (size_t)-1) {
+    errno = EILSEQ;
+    return (-1);
+  }
+  if (nwc == n) {
+    s[n - 1] = L'\0';
+    errno = EOVERFLOW;
+    return (-1);
+  }
+
+  return (ret);
+}

StdLib/LibC/Stdio/vswscanf.c

@@ -0,0 +1,100 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *  The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Donn Seeley at UUNET Technologies, Inc.
+ *
+ * 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.
+
+  FreeBSD: src/lib/libc/stdio/vswscanf.c,v 1.3 2004/04/07 09:55:05 tjr Exp
+  NetBSD: vswscanf.c,v 1.3 2005/12/02 13:51:22 yamt Exp
+ */
+#include  <LibConfig.h>
+#include  <sys/EfiCdefs.h>
+
+#include  <limits.h>
+#include  <stdarg.h>
+#include  <stdio.h>
+#include  <stdlib.h>
+#include  <string.h>
+#include  <wchar.h>
+#include  <sys/types.h>
+#include  "reentrant.h"
+#include  "local.h"
+
+static int  eofread(void *, char *, int);
+
+static int
+/*ARGSUSED*/
+eofread(void *cookie, char *buf, int len)
+{
+  return (0);
+}
+
+int
+vswscanf(
+  const wchar_t * __restrict str,
+  const wchar_t * __restrict fmt,
+  va_list ap
+  )
+{
+  static const mbstate_t initial = { 0 };
+  mbstate_t mbs;
+  FILE f;
+  char *mbstr;
+  size_t mlen;
+  int r;
+  const wchar_t *rstr = str;
+  struct __sfileext fext = { 0 };
+
+  /*
+   * XXX Convert the wide character string to multibyte, which
+   * __vfwscanf() will convert back to wide characters.
+   */
+  if ((mbstr = malloc(wcslen(str) * MB_CUR_MAX + 1)) == NULL)
+    return (EOF);
+  mbs = initial;
+  if ((mlen = wcsrtombs(mbstr, &rstr, SIZE_T_MAX, &mbs)) == (size_t)-1) {
+    free(mbstr);
+    return (EOF);
+  }
+  _FILEEXT_SETUP(&f, &fext);
+  f._file = -1;
+  f._flags = __SRD;
+  f._bf._base = f._p = (unsigned char *)mbstr;
+  f._bf._size = f._r = (int)mlen;
+  f._read = eofread;
+  _UB(&f)._base = NULL;
+  f._lb._base = NULL;
+  r = __vfwscanf_unlocked(&f, fmt, ap);
+  free(mbstr);
+
+  return (r);
+}

StdLib/LibC/Stdio/vwprintf.c

@@ -0,0 +1,41 @@
+/*-
+ * 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.
+
+  FreeBSD: src/lib/libc/stdio/vwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp
+  NetBSD: vwprintf.c,v 1.1 2005/05/14 23:51:02 christos Exp
+ */
+#include  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+vwprintf(const wchar_t * __restrict fmt, va_list ap)
+{
+
+  return (vfwprintf(stdout, fmt, ap));
+}

StdLib/LibC/Stdio/vwscanf.c

@@ -0,0 +1,47 @@
+/*  $NetBSD: vwscanf.c,v 1.1 2005/05/14 23:51:02 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+__FBSDID("$FreeBSD: src/lib/libc/stdio/vwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
+#else
+__RCSID("$NetBSD: vwscanf.c,v 1.1 2005/05/14 23:51:02 christos Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <wchar.h>
+
+int
+vwscanf(const wchar_t * __restrict fmt, va_list ap)
+{
+
+  return (vfwscanf(stdin, fmt, ap));
+}

StdLib/LibC/Stdio/wbuf.c

@@ -0,0 +1,99 @@
+/*  $NetBSD: wbuf.c,v 1.13 2003/08/07 16:43:35 agc Exp $  */
+
+/*-
+ * 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. 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  <LibConfig.h>
+#include <sys/EfiCdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)wbuf.c  8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: wbuf.c,v 1.13 2003/08/07 16:43:35 agc Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include "reentrant.h"
+#include "local.h"
+
+/*
+ * Write the given character into the (probably full) buffer for
+ * the given file.  Flush the buffer out if it is or becomes full,
+ * or if c=='\n' and the file is line buffered.
+ */
+int
+__swbuf(int c, FILE *fp)
+{
+  int n;
+
+  //_DIAGASSERT(fp != NULL);
+
+  _SET_ORIENTATION(fp, -1);
+
+  /*
+   * In case we cannot write, or longjmp takes us out early,
+   * make sure _w is 0 (if fully- or un-buffered) or -_bf._size
+   * (if line buffered) so that we will get called again.
+   * If we did not do this, a sufficient number of putc()
+   * calls might wrap _w from negative to positive.
+   */
+  fp->_w = fp->_lbfsize;
+  if (cantwrite(fp)) {
+    errno = EBADF;
+    return (EOF);
+  }
+  c = (unsigned char)c;
+
+  /*
+   * If it is completely full, flush it out.  Then, in any case,
+   * stuff c into the buffer.  If this causes the buffer to fill
+   * completely, or if c is '\n' and the file is line buffered,
+   * flush it (perhaps a second time).  The second flush will always
+   * happen on unbuffered streams, where _bf._size==1; fflush()
+   * guarantees that putc() will always call wbuf() by setting _w
+   * to 0, so we need not do anything else.
+   */
+  n = (int)(fp->_p - fp->_bf._base);
+  if (n >= fp->_bf._size) {
+    if (fflush(fp))
+      return (EOF);
+    n = 0;
+  }
+  fp->_w--;
+  *fp->_p++ = (unsigned char)c;
+  if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n'))
+    if (fflush(fp))
+      return (EOF);
+  return (c);
+}

StdLib/LibC/Stdio/wcio.h

@@ -0,0 +1,72 @@
+/* $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:
+ * 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.
+ *
+ * $Citrus$
+ */
+
+#ifndef _WCIO_H_
+#define _WCIO_H_
+
+#include <wchar.h> /* for mbstate_t and wchar_t */
+
+/* minimal requirement of SUSv2 */
+#define WCIO_UNGETWC_BUFSIZE 1
+
+#define WCIO_GET(fp) (&(_EXT(fp)->_wcio))
+
+struct wchar_io_data {
+  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 */
+};
+
+#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 (/*CONSTCOND*/0)
+
+/*
+ * WCIO_FREE should be called by fclose
+ */
+#define WCIO_FREE(fp) \
+do {\
+  _EXT(fp)->_wcio.wcio_mode = 0;\
+  WCIO_FREEUB(fp);\
+} while (/*CONSTCOND*/0)
+
+#define WCIO_FREEUB(fp) \
+do {\
+  _EXT(fp)->_wcio.wcio_ungetwc_inbuf = 0;\
+} while (/*CONSTCOND*/0)
+
+#endif /*_WCIO_H_*/