Still trying to recover directory contents

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5330 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 0 insertions, 848 deletions

diff --git a/nuttx/lib/unistd/Make.defs b/nuttx/lib/unistd/Make.defs
deleted file mode 100644
index e1441a48d..000000000
--- a/nuttx/lib/unistd/Make.defs
+++ /dev/null
@@ -1,49 +0,0 @@
-############################################################################
-# lib/unistd/Make.defs
-#
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# Add the unistd C files to the build
-
-CSRCS += lib_getopt.c lib_getoptargp.c lib_getoptindp.c lib_getoptoptp.c
-
-ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-ifneq ($(CONFIG_DISABLE_ENVIRON),y)
-CSRCS +=  lib_chdir.c lib_getcwd.c
-endif
-endif
-
-# Add the unistd directory to the build
-
-DEPPATH += --dep-path unistd
-VPATH += :unistd
diff --git a/nuttx/lib/unistd/lib_chdir.c b/nuttx/lib/unistd/lib_chdir.c
deleted file mode 100644
index 3dd1333ce..000000000
--- a/nuttx/lib/unistd/lib_chdir.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_chdir.c
- *
- *   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "lib_internal.h"
-
-#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)
-
-/****************************************************************************
- * Public Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: _trimdir
- ****************************************************************************/
-
-#if 0
-static inline void _trimdir(char *path)
-{
- /* Skip any trailing '/' characters (unless it is also the leading '/') */
-
- int len = strlen(path) - 1;
- while (len > 0 && path[len] == '/')
-   {
-      path[len] = '\0';
-      len--;
-   }
-}
-#else
-#  define _trimdir(p)
-#endif
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: chdir
- *
- * Description:
- *   The chdir() function causes the directory named by the pathname pointed
- *   to by the 'path' argument to become the current working directory; that
- *   is, the starting point for path searches for pathnames not beginning
- *   with '/'.
- *
- * Input Parmeters:
- *   path - A pointer to a directory to use as the new current working
- *     directory
- *
- * Returned Value:
- *   0(OK) on success; -1(ERROR) on failure with errno set appropriately:
- *
- *   EACCES
- *     Search permission is denied for any component of the pathname.
- *   ELOOP
- *     A loop exists in symbolic links encountered during resolution of the
- *     'path' argument OR more that SYMLOOP_MAX symbolic links in the
- *     resolution of the 'path' argument.
- *   ENAMETOOLONG
- *     The length of the path argument exceeds PATH_MAX or a pathname component
- *     is longer than NAME_MAX.
- *   ENOENT
- *     A component of 'path' does not name an existing directory or path is
- *     an empty string.
- *   ENOTDIR
- *     A component of the pathname is not a directory.
- *
- ****************************************************************************/
-
-int chdir(FAR const char *path)
-{
-  struct stat buf;
-  char *oldpwd;
-  char *alloc;
-  int err;
-  int ret;
-
-  /* Verify the input parameters */
-
-  if (!path)
-    {
-      err = ENOENT;
-      goto errout;
-    }
-
-  /* Verify that 'path' refers to a directory */
-
-  ret = stat(path, &buf);
-  if (ret != 0)
-    {
-      err = ENOENT;
-      goto errout;
-    }
-
-  /* Something exists here... is it a directory? */
-
-  if (!S_ISDIR(buf.st_mode))
-    {
-      err = ENOTDIR;
-      goto errout;
-    }
-
-  /* Yes, it is a directory. Remove any trailing '/' characters from the path */
-
-  _trimdir(path);
-
-  /* Replace any preceding OLDPWD with the current PWD (this is to
-   * support 'cd -' in NSH)
-   */
-
-  sched_lock();
-  oldpwd = getenv("PWD");
-  if (!oldpwd)
-    {
-      oldpwd = CONFIG_LIB_HOMEDIR;
-    }
-
-  alloc = strdup(oldpwd);  /* kludge needed because environment is realloc'ed */
-  setenv("OLDPWD", alloc, TRUE);
-  lib_free(alloc);
-
-  /* Set the cwd to the input 'path' */
-
-  setenv("PWD", path, TRUE);
-  sched_unlock();
-  return OK;
-
-errout:
-  set_errno(err);
-  return ERROR;
-}
-#endif /* CONFIG_NFILE_DESCRIPTORS && !CONFIG_DISABLE_ENVIRON */
diff --git a/nuttx/lib/unistd/lib_getcwd.c b/nuttx/lib/unistd/lib_getcwd.c
deleted file mode 100644
index b94823300..000000000
--- a/nuttx/lib/unistd/lib_getcwd.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_getcwd.c
- *
- *   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "lib_internal.h"
-
-#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON)
-
-/****************************************************************************
- * Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: getwcd
- *
- * Description:
- *   getcwd() function places the absolute pathname of the current working
- *   directory in the array pointed to by 'buf', and returns 'buf.' The
- *   pathname copied to the array shall contain no components that are
- *   symbolic links. The 'size' argument is the size in bytes of the
- *   character array pointed to by the 'buf' argument.
- *
- * Input Parmeters:
- *   buf - a pointer to the location in which the current working directory
- *     pathaname is returned.
- *   size - The size in bytes avaiable at 'buf'
- *
- * Returned Value:
- *   Upon successful completion, getcwd() returns the 'buf' argument.
- *   Otherwise, getcwd() returns a null pointer and sets errno to indicate
- *   the error:
- *
- *   EINVAL
- *     The 'size' argument is 0 or the 'buf' argument is NULL.
- *   ERANGE
- *     The size argument is greater than 0, but is smaller than the length
- *     of the currrent working directory pathname +1.
- *   EACCES
- *     Read or search permission was denied for a component of the pathname.
- *   ENOMEM
- *  Insufficient storage space is available. 
- *
- ****************************************************************************/
-
-FAR char *getcwd(FAR char *buf, size_t size)
-{
-  char *pwd;
-
-  /* Verify input parameters */
-
-#ifdef CONFIG_DEBUG
-  if (!buf || !size)
-    {
-      set_errno(EINVAL);
-      return NULL;
-    }
-#endif
-
-  /* If no working directory is defined, then default to the home directory */
-
-  pwd = getenv("PWD");
-  if (!pwd)
-    {
-      pwd = CONFIG_LIB_HOMEDIR;
-    }
-
-  /* Verify that the cwd will fit into the user-provided buffer */
-
-  if (strlen(pwd) + 1 > size)
-    {
-      set_errno(ERANGE);
-      return NULL;
-    }
-
-  /* Copy the cwd to the user buffer */
-
-  strcpy(buf, pwd);
-  sched_unlock();
-  return buf;
-}
-#endif /* CONFIG_NFILE_DESCRIPTORS && !CONFIG_DISABLE_ENVIRON */
diff --git a/nuttx/lib/unistd/lib_getopt.c b/nuttx/lib/unistd/lib_getopt.c
deleted file mode 100644
index 832d28721..000000000
--- a/nuttx/lib/unistd/lib_getopt.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_getopt.c
- *
- *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdbool.h>
-#include <unistd.h>
-#include <string.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-FAR char *optarg; /* Optional argument following option */
-int optind = 1;   /* Index into argv */
-int optopt = '?'; /* unrecognized option character */
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-static FAR char *g_optptr       = NULL;
-static bool      g_binitialized = false;
-
-/****************************************************************************
- * Global Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: getopt
- *
- * Description: getopt() parses command-line arguments.  Its arguments argc
- *   and argv are the argument count and array as passed to the main()
- *   function on program invocation.  An element of argv that starts with
- *   '-' is an option element. The characters of this element (aside from
- *   the initial '-') are option characters. If getopt() is called repeatedly,
- *   it returns successively each of the option characters from each of the
- *   option elements.
- *
- *   If getopt() finds another option character, it returns that character,
- *   updating the external variable optind and a static variable nextchar so
- *   that the next call to getopt() can resume the scan with the following
- *   option character or argv-element.
- *
- *   If there are no more option characters, getopt() returns -1. Then optind
- *   is the index in argv of the first argv-element that is not an option.
- *
- *   The 'optstring' argument is a string containing the legitimate option
- *   characters. If such a character is followed by a colon, this indicates
- *   that the option requires an argument.  If an argument is required for an
- *   option so getopt() places a pointer to the following text in the same
- *   argv-element, or the text of the following argv-element, in optarg.
- *
- *   NOTES:
- *   1. opterr is not supported and this implementation of getopt() never
- *      printfs error messages.
- *   2. getopt is NOT threadsafe!
- *   3. This version of getopt() does not reset global variables until
- *      -1 is returned.  As a result, your command line parsing loops
- *      must call getopt() repeatedly and continue to parse if other
- *      errors are returned ('?' or ':') until getopt() finally returns -1.
- *     (You can also set optind to -1 to force a reset).
- *
- * Return: If an option was successfully found, then getopt() returns the
- *   option character. If all command-line options have been parsed, then
- *   getopt() returns -1.  If getopt() encounters an option character that
- *   was not in optstring, then '?' is returned. If getopt() encounters an
- *   option with a missing argument, then the return value depends on the
- *   first character in optstring: if it is ':', then ':' is returned;
- *   otherwise '?' is returned.
- *
- ****************************************************************************/
-
-int getopt(int argc, FAR char *const argv[], FAR const char *optstring)
-{
-  if (argv && optstring && argc > 1)
-    {
-      int noarg_ret = '?';
-      char *optchar;
-
-      /* The inital value of optind is 1.  If getopt() is called again in the
-       * program, optind must be reset to some value <= 1.
-       */
-
-      if (optind < 1 || !g_binitialized)
-        {
-          optind         = 1;     /* Skip over the program name */
-          g_optptr       = NULL;  /* Start at the beginning of the first argument */
-          g_binitialized = true;  /* Now we are initialized */
-        }
-
-      /* If the first character of opstring s ':', then ':' is in the event of
-       * a missing argument. Otherwise '?' is returned.
-       */
-
-      if (*optstring == ':')
-        {
-           noarg_ret = ':';
-           optstring++;
-        }
-
-      /* Are we resuming in the middle, or at the end of a string of arguments?
-       * g_optptr == NULL means that we are started at the beginning of argv[optind];
-       * *g_optptr == \0 means that we are starting at the beginning of optind+1
-       */
-
-      while (!g_optptr || !*g_optptr)
-        {
-          /* We need to start at the beginning of the next argv. Check if we need
-           * to increment optind
-           */
-
-          if (g_optptr)
-            {
-              /* Yes.. Increment it and check for the case where where we have
-               * processed everything in the argv[] array.
-               */
-
-              optind++;
-            }
-
-          /* Check for the end of the argument list */
-
-          g_optptr = argv[optind];
-          if (!g_optptr)
-            {
-              /* There are no more arguments, we are finished */
-
-              g_binitialized = false;
-              return ERROR;
-            }
-
-          /* We are starting at the beginning of argv[optind].  In this case, the
-           * first character must be '-'
-           */
-
-          if (*g_optptr != '-')
-            {
-              /* The argument does not start with '-', we are finished */
-
-              g_binitialized = false;
-              return ERROR;
-            }
-
-          /* Skip over the '-' */
-
-          g_optptr++;
-        }
-
-        /* Special case handling of "-" and "-:" */
-
-        if (!*g_optptr)
-          {
-             optopt = '\0'; /* We'll fix up g_optptr the next time we are called */
-             return '?';
-          }
-
-        /* Handle the case of "-:" */
-
-        if (*g_optptr == ':')
-          {
-            optopt = ':';
-            g_optptr++;
-            return '?';
-          }
-
-        /* g_optptr now points at the next option and it is not something crazy.
-         * check if the option is in the list of valid options.
-         */
-
-        optchar = strchr(optstring, *g_optptr);
-        if (!optchar)
-          {
-            /* No this character is not in the list of valid options */
-
-            optopt = *g_optptr;
-            g_optptr++;
-            return '?';
-          }
-
-        /* Yes, the character is in the list of valid options.  Does it have an
-         * required argument?
-         */
-
-        if (optchar[1] != ':')
-          {
-            /* No, no arguments. Just return the character that we found */
-
-            g_optptr++;
-            return *optchar;
-          }
-
-        /* Yes, it has a required argument.  Is the required argument
-         * immediately after the command in this same argument?
-         */
-
-        if (g_optptr[1] != '\0')
-          {
-              /* Yes, return a pointer into the current argument */
-
-              optarg = &g_optptr[1];
-              optind++;
-              g_optptr = NULL;
-              return *optchar;
-          }
-
-        /* No.. is the optional argument the next argument in argv[] ? */
-
-        if (argv[optind+1] && *argv[optind+1] != '-')
-          {
-            /* Yes.. return that */
-
-            optarg = argv[optind+1];
-            optind += 2;
-            g_optptr = NULL;
-            return *optchar;
-          }
-
-        /* No argument was supplied */
-
-        optarg = NULL;
-        optopt = *optchar;
-        optind++;
-        return noarg_ret;
-    }
-
-  g_binitialized = false;
-  return ERROR;
-}
diff --git a/nuttx/lib/unistd/lib_getoptargp.c b/nuttx/lib/unistd/lib_getoptargp.c
deleted file mode 100644
index 98a485016..000000000
--- a/nuttx/lib/unistd/lib_getoptargp.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_getoptargp.c
- *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <unistd.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Global Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: getoptargp
- *
- * Description:
- *   Returns a pointer to optarg.  This function is only used for external
- *   modules that need to access the base, global variable, optarg.
- *
- ****************************************************************************/
-
-FAR char **getoptargp(void)
-{
-  return &optarg;
-}
-
diff --git a/nuttx/lib/unistd/lib_getoptindp.c b/nuttx/lib/unistd/lib_getoptindp.c
deleted file mode 100644
index 7714f8e70..000000000
--- a/nuttx/lib/unistd/lib_getoptindp.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_getoptindp.c
- *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <unistd.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Global Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: getoptindp
- *
- * Description:
- *   Returns a pointer to optind.  This function is only used for external
- *   modules that need to access the base, global variable, optind.
- *
- ****************************************************************************/
-
-int *getoptindp(void)
-{
-  return &optind;
-}
-
diff --git a/nuttx/lib/unistd/lib_getoptoptp.c b/nuttx/lib/unistd/lib_getoptoptp.c
deleted file mode 100644
index 4805b7ac3..000000000
--- a/nuttx/lib/unistd/lib_getoptoptp.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
- * lib/unistd/lib_getoptoptp.c
- *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 NuttX 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 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <unistd.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Global Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Global Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: getoptoptp
- *
- * Description:
- *   Returns a pointer to optopt.  This function is only used for external
- *   modules that need to access the base, global variable, optopt.
- *
- ****************************************************************************/
-
-int *getoptoptp(void)
-{
-  return &optopt;
-}
-