Changeset 23a0368 in mainline for uspace/lib/c

Timestamp:

2017-03-30T19:52:23Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ae7bfbbd

Parents:

b5b5d84

Message:

Rename stat() to vfs_stat_path() and fstat() to vfs_stat()

Location:

uspace/lib/c

Files:

• generic/io/io.c (modified) (3 diffs)
• generic/vfs/vfs.c (modified) (9 diffs)
• include/sys/stat.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (2 diffs)

uspace/lib/c/generic/io/io.c

@@ -41 +41 @@
 #include <stdbool.h>
 #include <malloc.h>
-#include <sys/stat.h>
 #include <async.h>
 #include <io/kio.h>
@@ -765 +764 @@
 int fseek(FILE *stream, off64_t offset, int whence)
 {
+        int rc;
+
         if (stream->error)
                 return -1;
@@ -785 +786 @@
                 break;
         case SEEK_END:
-                if (fstat(stream->fd, &st) != EOK) {
-                        /* errno was set by fstat() */
+                rc = vfs_stat(stream->fd, &st);
+                if (rc != EOK) {
+                        errno = rc;
                         stream->error = true;
                         return -1;      

uspace/lib/c/generic/vfs/vfs.c

@@ -641 +641 @@
 /** Get file status.
  *
- * @param fildes File descriptor
+ * @param file File descriptor
  * @param stat Place to store file information
  *
- * @return 0 on success, -1 on error and sets errno.
- */
-int fstat(int fildes, struct stat *stat)
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_stat(int file, struct stat *stat)
 {
         sysarg_t rc;
@@ -653 +653 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_1(exch, VFS_IN_STAT, fildes, NULL);
+        req = async_send_1(exch, VFS_IN_STAT, file, NULL);
         rc = async_data_read_start(exch, (void *) stat, sizeof(struct stat));
         if (rc != EOK) {
@@ -663 +663 @@
                 if (rc_orig != EOK)
                         rc = rc_orig;
-                if (rc != EOK) {
-                        errno = rc;
-                        return -1;
-                }
                 
-                return 0;
+                return rc;
         }
         
@@ -674 +670 @@
         async_wait_for(req, &rc);
         
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-        
-        return 0;
+        return rc;
 }
 
@@ -687 +678 @@
  * @param stat Place to store file information
  *
- * @return 0 on success, -1 on error and sets errno.
- */
-int stat(const char *path, struct stat *stat)
-{
-        int fd = vfs_lookup(path, 0);
-        if (fd < 0) {
-                errno = fd;
-                return -1;
-        }
-        
-        int rc = fstat(fd, stat);
-        if (rc != EOK) {
-                close(fd);
-                errno = rc;
-                rc = -1;
-        } else
-                rc = close(fd);
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_stat_path(const char *path, struct stat *stat)
+{
+        int file = vfs_lookup(path, 0);
+        if (file < 0)
+                return file;
+        
+        int rc = vfs_stat(file, stat);
+
+        close(file);
 
         return rc;
@@ -1057 +1042 @@
  * @return On success returns session pointer. On error returns @c NULL.
  */
-async_sess_t *vfs_fd_session(int fildes, iface_t iface)
+async_sess_t *vfs_fd_session(int file, iface_t iface)
 {
         struct stat stat;
-        int rc = fstat(fildes, &stat);
+        int rc = vfs_stat(file, &stat);
         if (rc != 0)
                 return NULL;
@@ -1122 +1107 @@
                 child = pa;
 
-                rc = stat(child, &st);
+                rc = vfs_stat_path(child, &st);
                 if (rc != 0) {
                         free(child);
@@ -1152 +1137 @@
         struct stat st;
 
-        int rc = stat("/", &st);
+        int rc = vfs_stat_path("/", &st);
         if (rc != 0)
                 return rc;
@@ -1165 +1150 @@
  * @param file File located on the queried file system
  * @param st Buffer for storing information
- * @return 0 on success. On error -1 is returned and errno is set.
+ * @return EOK on success or a negative error code otherwise.
  */
 int vfs_statfs(int file, struct statfs *st)

uspace/lib/c/include/sys/stat.h

@@ -36 +36 @@
 #define LIBC_SYS_STAT_H_
 
-#include <sys/types.h>
-#include <stdbool.h>
 #include <ipc/vfs.h>
-#include <ipc/loc.h>
 
-struct stat {
-        fs_handle_t fs_handle;
-        service_id_t service_id;
-        fs_index_t index;
-        unsigned int lnkcnt;
-        bool is_file;
-        bool is_directory;
-        aoff64_t size;
-        service_id_t service;
-};
-
-extern int fstat(int, struct stat *);
-extern int stat(const char *, struct stat *);
 extern int mkdir(const char *, mode_t);
 

uspace/lib/c/include/vfs/vfs.h

@@ -49 +49 @@
 };
 
+struct stat {
+        fs_handle_t fs_handle;
+        service_id_t service_id;
+        fs_index_t index;
+        unsigned int lnkcnt;
+        bool is_file;
+        bool is_directory;
+        aoff64_t size;
+        service_id_t service;
+};
+
 struct statfs { 
         char fs_name[FS_NAME_MAXLEN + 1];
@@ -79 +90 @@
 extern int vfs_root(void);
 extern void vfs_root_set(int);
+extern int vfs_stat(int, struct stat *);
+extern int vfs_stat_path(const char *, struct stat *);
 extern int vfs_statfs(int, struct statfs *);
 extern int vfs_statfs_path(const char *, struct statfs *);