libc: modify open,close... to _NX_OPEN,_NX_CLOSE

Signed-off-by: wangmingrong1 <[email protected]>
apache · Nov 11, 2024 · 4c560a1 · 4c560a1
1 parent 5e8f1ee
commit 4c560a1
Show file tree

Hide file tree

Showing 145 changed files with 507 additions and 267 deletions.
diff --git a/libs/libc/aio/aio_return.c b/libs/libc/aio/aio_return.c
@@ -25,6 +25,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/fs/fs.h>
 
 #include <aio.h>
 #include <assert.h>
@@ -98,7 +99,7 @@ ssize_t aio_return(FAR struct aiocb *aiocbp)
   DEBUGASSERT(aiocbp);
   if (aiocbp->aio_result < 0)
     {
-      set_errno(-aiocbp->aio_result);
+      _NX_SETERRNO(-aiocbp->aio_result);
       return ERROR;
     }
 

diff --git a/libs/libc/aio/lio_listio.c b/libs/libc/aio/lio_listio.c
@@ -33,6 +33,7 @@
 #include <debug.h>
 #include <errno.h>
 
+#include <nuttx/fs/fs.h>
 #include <nuttx/signal.h>
 #include <nuttx/sched.h>
 
@@ -515,7 +516,7 @@ int lio_listio(int mode, FAR struct aiocb * const list[], int nent,
 
   if (mode != LIO_WAIT && mode != LIO_NOWAIT)
     {
-      set_errno(EINVAL);
+      _NX_SETERRNO(EINVAL);
       return ERROR;
     }
 
@@ -688,7 +689,7 @@ int lio_listio(int mode, FAR struct aiocb * const list[], int nent,
   sched_unlock();
   if (ret < 0)
     {
-      set_errno(retcode);
+      _NX_SETERRNO(retcode);
       return ERROR;
     }
 

diff --git a/libs/libc/dirent/lib_closedir.c b/libs/libc/dirent/lib_closedir.c
@@ -33,6 +33,8 @@
 
 #include <unistd.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /****************************************************************************
@@ -69,7 +71,7 @@ int closedir(FAR DIR *dirp)
 
   if (dirp == NULL)
     {
-      set_errno(EBADF);
+      _NX_SETERRNO(EBADF);
       return -1;
     }
 
@@ -78,7 +80,7 @@ int closedir(FAR DIR *dirp)
                                        (uintptr_t)dirp);
   ret = android_fdsan_close_with_tag(dirp->fd, tag);
 #else
-  ret = close(dirp->fd);
+  ret = _NX_CLOSE(dirp->fd);
 #endif
 
   lib_free(dirp);

diff --git a/libs/libc/dirent/lib_dirfd.c b/libs/libc/dirent/lib_dirfd.c
@@ -27,6 +27,8 @@
 #include <dirent.h>
 #include <errno.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -62,6 +64,6 @@ int dirfd(FAR DIR *dirp)
       return dirp->fd;
     }
 
-  set_errno(EINVAL);
+  _NX_SETERRNO(EINVAL);
   return -1;
 }
diff --git a/libs/libc/dirent/lib_fdopendir.c b/libs/libc/dirent/lib_fdopendir.c
@@ -33,6 +33,8 @@
 #  include <android/fdsan.h>
 #endif
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /****************************************************************************
@@ -69,22 +71,22 @@ FAR DIR *fdopendir(int fd)
   FAR DIR *dir;
   int ret;
 
-  ret = fstat(fd, &st);
+  ret = _NX_STAT(fd, &st);
   if (ret == -1)
     {
       return NULL;
     }
 
   if (!S_ISDIR(st.st_mode))
     {
-      set_errno(ENOTDIR);
+      _NX_SETERRNO(ENOTDIR);
       return NULL;
     }
 
   dir = lib_malloc(sizeof(*dir));
   if (dir == NULL)
     {
-      set_errno(ENOMEM);
+      _NX_SETERRNO(ENOMEM);
       return NULL;
     }
 

diff --git a/libs/libc/dirent/lib_nftw.c b/libs/libc/dirent/lib_nftw.c
@@ -32,6 +32,8 @@
 #include <string.h>
 #include <limits.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /****************************************************************************
@@ -198,7 +200,7 @@ do_nftw(FAR char *path, nftw_cb_t fn, int fdlimit, int flags, int level)
 
           if (strlen(de->d_name) > PATH_MAX - j)
             {
-              set_errno(ENAMETOOLONG);
+              _NX_SETERRNO(ENAMETOOLONG);
               closedir(dir);
               return -1;
             }

diff --git a/libs/libc/dirent/lib_opendir.c b/libs/libc/dirent/lib_opendir.c
@@ -34,6 +34,8 @@
 
 #include <string.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /****************************************************************************
@@ -78,11 +80,11 @@ FAR DIR *opendir(FAR const char *path)
   dir = lib_malloc(sizeof(*dir));
   if (dir == NULL)
     {
-      set_errno(ENOMEM);
+      _NX_SETERRNO(ENOMEM);
       return NULL;
     }
 
-  fd = open(path, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
+  fd = _NX_OPEN(path, O_RDONLY | O_DIRECTORY | O_CLOEXEC);
   if (fd < 0)
     {
       lib_free(dir);

diff --git a/libs/libc/dirent/lib_readdir.c b/libs/libc/dirent/lib_readdir.c
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -63,11 +65,11 @@ FAR struct dirent *readdir(DIR *dirp)
 
   if (!dirp)
     {
-      set_errno(EBADF);
+      _NX_SETERRNO(EBADF);
       return NULL;
     }
 
-  ret = read(dirp->fd, &dirp->entry, sizeof(struct dirent));
+  ret = _NX_READ(dirp->fd, &dirp->entry, sizeof(struct dirent));
   if (ret <= 0)
     {
       return NULL;

diff --git a/libs/libc/dirent/lib_readdirr.c b/libs/libc/dirent/lib_readdirr.c
@@ -76,7 +76,7 @@ int readdir_r(FAR DIR *dirp, FAR struct dirent *entry,
 
   /* NOTE: The following use or errno is *not* thread-safe */
 
-  set_errno(0);
+  _NX_SETERRNO(0);
   tmp = readdir(dirp);
   if (!tmp)
     {

diff --git a/libs/libc/dirent/lib_rewinddir.c b/libs/libc/dirent/lib_rewinddir.c
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -60,6 +62,6 @@ void rewinddir(FAR DIR *dirp)
     }
   else
     {
-      set_errno(EBADF);
+      _NX_SETERRNO(EBADF);
     }
 }
diff --git a/libs/libc/dirent/lib_scandir.c b/libs/libc/dirent/lib_scandir.c
@@ -31,6 +31,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /* The scandir() function is not appropriate for use within the kernel in its
@@ -102,7 +104,7 @@ int scandir(FAR const char *path, FAR struct dirent ***namelist,
 
   /* opendir might have set errno.  Reset to zero. */
 
-  set_errno(0);
+  _NX_SETERRNO(0);
 
   for (d = readdir(dirp); d != NULL; d = readdir(dirp))
     {
@@ -121,7 +123,7 @@ int scandir(FAR const char *path, FAR struct dirent ***namelist,
        * zero.
        */
 
-      set_errno(0);
+      _NX_SETERRNO(0);
 
       /* Grow the directory entry list, if required. */
 
@@ -179,7 +181,7 @@ int scandir(FAR const char *path, FAR struct dirent ***namelist,
        * to zero.
        */
 
-      set_errno(0);
+      _NX_SETERRNO(0);
     }
 
   if (get_errno() == 0)
@@ -221,7 +223,7 @@ int scandir(FAR const char *path, FAR struct dirent ***namelist,
     {
       /* Restore original errno value in case of success. */
 
-      set_errno(errsv);
+      _NX_SETERRNO(errsv);
     }
 
   return result;

diff --git a/libs/libc/dirent/lib_seekdir.c b/libs/libc/dirent/lib_seekdir.c
@@ -28,6 +28,8 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -62,6 +64,6 @@ void seekdir(FAR DIR *dirp, off_t offset)
     }
   else
     {
-      set_errno(EBADF);
+      _NX_SETERRNO(EBADF);
     }
 }
diff --git a/libs/libc/dirent/lib_telldir.c b/libs/libc/dirent/lib_telldir.c
@@ -28,6 +28,8 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -63,6 +65,6 @@ off_t telldir(FAR DIR *dirp)
       return lseek(dirp->fd, 0, SEEK_CUR);
     }
 
-  set_errno(EBADF);
+  _NX_SETERRNO(EBADF);
   return -1;
 }
diff --git a/libs/libc/dlfcn/lib_dladdr.c b/libs/libc/dlfcn/lib_dladdr.c
@@ -29,6 +29,8 @@
 #include <errno.h>
 #include <dlfcn.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -39,6 +41,6 @@
 
 int dladdr(const FAR void *addr, FAR Dl_info *info)
 {
-  set_errno(ENOTSUP);
+  _NX_SETERRNO(ENOTSUP);
   return 0;
 }
diff --git a/libs/libc/eventfd/lib_eventfd.c b/libs/libc/eventfd/lib_eventfd.c
@@ -28,17 +28,20 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include <nuttx/fs/fs.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
 
 int eventfd_read(int fd, FAR eventfd_t *value)
 {
-  return read(fd, value, sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
+  return _NX_READ(fd, value, sizeof (eventfd_t)) != sizeof (eventfd_t)
+                  ? -1 : 0;
 }
 
 int eventfd_write(int fd, eventfd_t value)
 {
-  return write(fd, &value,
+  return _NX_WRITE(fd, &value,
       sizeof (eventfd_t)) != sizeof (eventfd_t) ? -1 : 0;
 }
diff --git a/libs/libc/gdbstub/lib_gdbstub.c b/libs/libc/gdbstub/lib_gdbstub.c
@@ -36,6 +36,7 @@
 #include <nuttx/nuttx.h>
 #include <nuttx/sched.h>
 #include <nuttx/ascii.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/gdbstub.h>
 #include <nuttx/memoryregion.h>
 
@@ -648,7 +649,7 @@ static ssize_t gdb_hex2bin(FAR void *buf, size_t buf_len,
           in[pos], in[pos + 1], 0
         };
 
-      set_errno(0);
+      _NX_SETERRNO(0);
       out[pos / 2] = strtoul(ch, NULL, 16); /* Decode high nibble */
       if (out[pos / 2] == 0 && get_errno())
         {

diff --git a/libs/libc/grp/lib_getgrbuf.c b/libs/libc/grp/lib_getgrbuf.c
@@ -31,6 +31,8 @@
 #include <errno.h>
 #include <grp.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "grp/lib_grp.h"
 #include "libc.h"
 
@@ -108,7 +110,7 @@ FAR struct group *getgrbuf(gid_t gid, FAR const char *name,
   lib_free(g_buf);
   g_grp = NULL;
   g_buf = NULL;
-  set_errno(err);
+  _NX_SETERRNO(err);
 
   return NULL;
 }
diff --git a/libs/libc/inttypes/lib_strtoimax.c b/libs/libc/inttypes/lib_strtoimax.c
@@ -31,6 +31,8 @@
 #include <inttypes.h>
 #include <errno.h>
 
+#include <nuttx/fs/fs.h>
+
 #include "libc.h"
 
 /* Current implementation depends on strtoull() and, hence, is only
@@ -96,7 +98,7 @@ intmax_t strtoimax(FAR const char *nptr, FAR char **endptr, int base)
 
           if (accum > limit)
             {
-              set_errno(ERANGE);
+              _NX_SETERRNO(ERANGE);
               return INTMAX_MIN;
             }
 
@@ -105,7 +107,7 @@ intmax_t strtoimax(FAR const char *nptr, FAR char **endptr, int base)
 
       if (accum > INTMAX_MAX)
         {
-          set_errno(ERANGE);
+          _NX_SETERRNO(ERANGE);
           return INTMAX_MAX;
         }
     }