From 53e1e5c647b73e45569ed6e8b8a0a5b276aa685e Mon Sep 17 00:00:00 2001
From: darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 28 Jun 2011 02:34:10 +0000
Subject: =?UTF-8?q?Add=20device=20abstraction=20code=20for=20the=20UEFI=20?=
 =?UTF-8?q?Console=20and=20UEFI=20Shell-based=20file=20systems.=20Make=20a?=
 =?UTF-8?q?rgv=20use=20narrow=20characters=20instead=20of=20wide=20charact?=
 =?UTF-8?q?ers.=20Add=20setenv=20functionality.=20Add=20poll()=20system=20?=
 =?UTF-8?q?call.=20Change=20signal=20names=20into=20macros=20=E2=80=93=20r?=
 =?UTF-8?q?equired=20for=20standards=20compliance.=20=20The=20enums=20were?=
 =?UTF-8?q?=20renamed=20and=20moved=20to=20sys/signal.h=20and=20the=20new?=
 =?UTF-8?q?=20macros=20reference=20the=20enums.=20Added=20SIGBREAK,=20whic?=
 =?UTF-8?q?h=20is=20required=20for=20Python.=20Modify=20stdio=20functions?=
 =?UTF-8?q?=20to=20fail=20cleanly=20when=20called=20with=20a=20NULL=20File?=
 =?UTF-8?q?=20Pointer=20argument.=20Added=20<sys/cdefs.h>=20that=20just=20?=
 =?UTF-8?q?includes=20<sys/EfiCdefs.h>.=20=20By=20adding=20this=20wrapper,?=
 =?UTF-8?q?=20we=20improve=20compatibility=20with=20*nix=20files=20which?=
 =?UTF-8?q?=20assume=20<sys/cdefs>=20exists.=20Add=20<netdb.h>=20Added=20m?=
 =?UTF-8?q?acros=20for=20bcopy(),=20bcmp()=20and=20strsep().=20Modify=20th?=
 =?UTF-8?q?e=20clock()=20function=20so=20that=20it=20does=20not=20hang=20w?=
 =?UTF-8?q?hen=20running=20under=20an=20emulation=20environment=20such=20a?=
 =?UTF-8?q?s=20NT32.=20Move=20TM=20structure=20specific=20macros=20from=20?=
 =?UTF-8?q?the=20private=20tzfile.h=20into=20<time.h>=20Add=20strncasecmp?=
 =?UTF-8?q?=20function.=20Add=20strptime=20function.=20Add=20gettimeofday?=
 =?UTF-8?q?=20function.=20Add=20getcwd=20function.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11908 6f19259b-4bc3-4df7-8a09-765794883524
---
 StdLib/LibC/Stdio/makebuf.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'StdLib/LibC/Stdio/makebuf.c')

diff --git a/StdLib/LibC/Stdio/makebuf.c b/StdLib/LibC/Stdio/makebuf.c
index 75c475c3a5..4e69be1275 100644
--- a/StdLib/LibC/Stdio/makebuf.c
+++ b/StdLib/LibC/Stdio/makebuf.c
@@ -1,11 +1,11 @@
 /** @file
     Implementation of internal file buffer allocation functions.
 
-    Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+    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.php.
+    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.
@@ -74,6 +74,7 @@ __smakebuf(FILE *fp)
 
   _DIAGASSERT(fp != NULL);
 
+  if (fp != NULL) {
   if (fp->_flags & __SNBF) {
     fp->_bf._base = fp->_p = fp->_nbuf;
     fp->_bf._size = 1;
@@ -93,6 +94,7 @@ __smakebuf(FILE *fp)
   if (couldbetty || isatty(fp->_file))
     flags |= __SLBF;
   fp->_flags |= flags;
+  }
 }
 
 /*
@@ -106,6 +108,9 @@ __swhatbuf(FILE *fp, size_t *bufsize, int *couldbetty)
   _DIAGASSERT(fp != NULL);
   _DIAGASSERT(bufsize != NULL);
   _DIAGASSERT(couldbetty != NULL);
+  if(fp == NULL) {
+    return (__SNPT);
+  }
 
   if (fp->_file < 0 || fstat(fp->_file, &st) < 0) {
     *couldbetty = 0;
-- 
cgit v1.2.3