StdLib: Add directory access functions to PosixLib.

Update <dirent.h> and <sys/dirent.h> to latest version.
Enable the tempnam function.
Fix assignments within predicate expressions so that it is clear where assignment is intended and where comparison occurs.
Remove internal.h and DirFunctions.c with its non-portable opendir, closedir, and readdir functions.
Add modified versions of the NetBSD opendir, closedir, and readdir functions.
Fix the declaration of stat() to be standards compliant and consistent with code.

Clean up indentation and declarations of non-existent objects.


Signed-off-by: darylm503
Reviewed-by: lgrosenb
Reviewed-by: lpleahy
Reviewed-by: jljusten


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

6 files changed, 366 insertions, 2 deletions

diff --git a/StdLib/PosixLib/Gen/LibGen.inf b/StdLib/PosixLib/Gen/LibGen.inf
index 276b2ee427..1fc20fe216 100644
--- a/StdLib/PosixLib/Gen/LibGen.inf
+++ b/StdLib/PosixLib/Gen/LibGen.inf
@@ -28,6 +28,9 @@
 

 [Sources.common]

   dirname.c

+  opendir.c

+  closedir.c

+  readdir.c

 

 [Packages]

   MdePkg/MdePkg.dec

@@ -35,6 +38,7 @@
   StdLibPrivateInternalFiles/DoNotUse.dec

 

 [Libraries]

+  LibStdio

   LibString

   LibStdLib

 

diff --git a/StdLib/PosixLib/Gen/closedir.c b/StdLib/PosixLib/Gen/closedir.c
new file mode 100644
index 0000000000..e5863b59ad
--- /dev/null
+++ b/StdLib/PosixLib/Gen/closedir.c
@@ -0,0 +1,88 @@
+/** @file

+    Close an open directory.

+

+    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

+    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.

+

+    Copyright (c) 1983, 1993

+     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: closedir.c,v 1.15 2006/05/17 20:36:50 christos Exp

+    closedir.c  8.1 (Berkeley) 6/10/93

+**/

+#include <sys/cdefs.h>

+

+#include  <namespace.h>

+#include  <reentrant.h>

+#include  <extern.h>

+#include <sys/types.h>

+

+#include <assert.h>

+#include <dirent.h>

+#include <errno.h>

+#include <stdlib.h>

+#include <unistd.h>

+

+#ifdef __weak_alias

+__weak_alias(closedir,_closedir)

+#endif

+

+/*

+ * close a directory.

+ */

+int

+closedir(DIR *dirp)

+{

+  int fd;

+

+  _DIAGASSERT(dirp != NULL);

+

+#ifdef _REENTRANT

+  if (__isthreaded)

+    mutex_lock((mutex_t *)dirp->dd_lock);

+#endif

+  fd = dirp->dd_fd;

+  dirp->dd_fd = -1;

+  dirp->dd_loc = 0;

+  free(dirp->dd_buf);

+

+#ifdef _REENTRANT

+  if (__isthreaded) {

+    mutex_unlock((mutex_t *)dirp->dd_lock);

+    mutex_destroy((mutex_t *)dirp->dd_lock);

+    free(dirp->dd_lock);

+  }

+#endif

+  free((void *)dirp);

+  return(close(fd));

+}

diff --git a/StdLib/PosixLib/Gen/opendir.c b/StdLib/PosixLib/Gen/opendir.c
new file mode 100644
index 0000000000..cb4ffbc477
--- /dev/null
+++ b/StdLib/PosixLib/Gen/opendir.c
@@ -0,0 +1,136 @@
+/** @file

+    Open a directory.

+

+    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

+    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.

+

+    Copyright (c) 1983, 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: opendir.c,v 1.33 2008/01/10 09:49:04 elad Exp

+    opendir.c 8.7 (Berkeley) 12/10/94

+**/

+#include <sys/cdefs.h>

+

+#include  <namespace.h>

+#include  <reentrant.h>

+#include  <extern.h>

+#include <sys/param.h>

+//#include <sys/mount.h>

+#include <sys/stat.h>

+

+#include <assert.h>

+#include <dirent.h>

+#include <errno.h>

+#include <fcntl.h>

+#include <stdlib.h>

+#include <string.h>

+#include <unistd.h>

+

+#define MAXITERATIONS 100

+

+/*

+ * Open a directory.

+ */

+DIR *

+opendir(const char *name)

+{

+  _DIAGASSERT(name != NULL);

+

+  return (__opendir2(name, DTF_HIDEW|DTF_NODUP));

+}

+

+DIR *

+__opendir2(const char *name, int flags)

+{

+  DIR *dirp = NULL;

+  int fd;

+  int serrno;

+  struct stat sb;

+  int incr;

+

+  _DIAGASSERT(name != NULL);

+

+  if ((fd = open(name, O_RDONLY | O_NONBLOCK, 0)) == -1 ||

+      fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)

+    goto error;

+  if (fstat(fd, &sb) || !S_ISDIR(sb.st_mode)) {

+    errno = ENOTDIR;

+    goto error;

+  }

+  if ((dirp = (DIR *)malloc(sizeof(DIR))) == NULL)

+    goto error;

+  dirp->dd_buf = NULL;

+

+  /*

+   * If the machine's page size is an exact multiple of DIRBLKSIZ,

+   * use a buffer that is cluster boundary aligned.

+   * Hopefully this can be a big win someday by allowing page trades

+   * to user space to be done by getdirentries()

+   */

+  incr = DIRBLKSIZ;

+

+  dirp->dd_len = incr;

+  dirp->dd_buf = malloc((size_t)dirp->dd_len);

+  if (dirp->dd_buf == NULL)

+    goto error;

+  dirp->dd_seek = 0;

+  flags &= ~DTF_REWIND;

+

+  dirp->dd_loc = 0;

+  dirp->dd_fd = fd;

+  dirp->dd_flags = flags;

+

+  /*

+   * Set up seek point for rewinddir.

+   */

+#ifdef _REENTRANT

+  if (__isthreaded) {

+    if ((dirp->dd_lock = malloc(sizeof(mutex_t))) == NULL)

+      goto error;

+    mutex_init((mutex_t *)dirp->dd_lock, NULL);

+  }

+#endif

+  dirp->dd_internal = NULL;

+  return (dirp);

+error:

+  serrno = errno;

+  if (dirp && dirp->dd_buf)

+    free(dirp->dd_buf);

+  if (dirp)

+    free(dirp);

+  if (fd != -1)

+    (void)close(fd);

+  errno = serrno;

+  return NULL;

+}

diff --git a/StdLib/PosixLib/Gen/readdir.c b/StdLib/PosixLib/Gen/readdir.c
new file mode 100644
index 0000000000..b8ad0af2a3
--- /dev/null
+++ b/StdLib/PosixLib/Gen/readdir.c
@@ -0,0 +1,138 @@
+/** @file

+    Get next entry in a directory.

+

+    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

+    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.

+

+    Copyright (c) 1983, 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: readdir.c,v 1.24 2008/05/04 18:53:26 tonnerre Exp

+    readdir.c 8.3 (Berkeley) 9/29/94

+ */

+#include <sys/cdefs.h>

+

+#include  <namespace.h>

+#include  <reentrant.h>

+#include  <extern.h>

+#include <sys/param.h>

+#include  <sys/stdint.h>

+

+#include  <stdio.h>

+#include <dirent.h>

+#include <errno.h>

+#include <string.h>

+#include <unistd.h>

+

+#include  <sys/EfiSysCall.h>

+

+/*

+ * get next entry in a directory.

+ */

+struct dirent *

+_readdir_unlocked(DIR *dirp, int skipdeleted)

+{

+  struct dirent *dp;

+

+

+  for (;;) {

+    if (dirp->dd_loc >= dirp->dd_size) {

+      if (dirp->dd_flags & __DTF_READALL)

+        return (NULL);

+      dirp->dd_loc = 0;

+    }

+    if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {

+      dirp->dd_size = (long)read(dirp->dd_fd, dirp->dd_buf, (size_t)dirp->dd_len);

+      if (dirp->dd_size <= 0)

+        return (NULL);

+    }

+    dp = (struct dirent *) (void *)(dirp->dd_buf + (size_t)dirp->dd_loc);

+    if ((intptr_t)dp & _DIRENT_ALIGN(dp))/* bogus pointer check */

+      return (NULL);

+    dirp->dd_loc += (long)dp->Size;

+    if ((dp->Attribute & DT_HIDDEN) && (dirp->dd_flags & DTF_HIDEW))

+      continue;

+    return (dp);

+  }

+}

+

+struct dirent *

+readdir(DIR *dirp)

+{

+  struct dirent *dp;

+

+#ifdef _REENTRANT

+  if (__isthreaded) {

+    mutex_lock((mutex_t *)dirp->dd_lock);

+    dp = _readdir_unlocked(dirp, 1);

+    mutex_unlock((mutex_t *)dirp->dd_lock);

+  }

+  else

+#endif

+    dp = _readdir_unlocked(dirp, 1);

+  return (dp);

+}

+

+int

+readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)

+{

+  struct dirent *dp;

+  int saved_errno;

+

+  saved_errno = errno;

+  errno = 0;

+#ifdef _REENTRANT

+  if (__isthreaded) {

+    mutex_lock((mutex_t *)dirp->dd_lock);

+    if ((dp = _readdir_unlocked(dirp, 1)) != NULL)

+      memcpy(entry, dp, (size_t)_DIRENT_SIZE(dp));

+    mutex_unlock((mutex_t *)dirp->dd_lock);

+  }

+  else

+#endif

+    if ((dp = _readdir_unlocked(dirp, 1)) != NULL)

+      memcpy(entry, dp, (size_t)_DIRENT_SIZE(dp));

+

+  if (errno != 0) {

+    if (dp == NULL)

+      return (errno);

+  } else

+    errno = saved_errno;

+

+  if (dp != NULL)

+    *result = entry;

+  else

+    *result = NULL;

+

+  return (0);

+}

diff --git a/StdLib/PosixLib/Glob/LibGlob.inf b/StdLib/PosixLib/Glob/LibGlob.inf
index 06404382b7..9e2674d215 100644
--- a/StdLib/PosixLib/Glob/LibGlob.inf
+++ b/StdLib/PosixLib/Glob/LibGlob.inf
@@ -27,7 +27,6 @@
 #

 

 [Sources.common]

-  DirFunctions.c

   glob.c

 

 [Packages]

diff --git a/StdLib/PosixLib/Glob/glob.c b/StdLib/PosixLib/Glob/glob.c
index a6a2dc156e..e7556c226a 100644
--- a/StdLib/PosixLib/Glob/glob.c
+++ b/StdLib/PosixLib/Glob/glob.c
@@ -89,7 +89,6 @@
 #include <string.h>

 #include <unistd.h>

 #include <sys/fcntl.h>

-#include "internal.h"

 

 #ifdef HAVE_NBTOOL_CONFIG_H

 #define NO_GETPW_R