Changeset 0b97336 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-03-18T15:13:28Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

38aaf005

Parents:

c725619

Message:

Set errno and return -1 for standards-alluding interfaces

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (15 diffs)

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

@@ -395 +395 @@
         assert((((oflag & O_RDONLY) != 0) + ((oflag & O_WRONLY) != 0) + ((oflag & O_RDWR) != 0)) == 1);
         
-        int ret = vfs_lookup(path, walk_flags(oflag) | WALK_REGULAR);
-        if (ret < 0) {
-                return ret;
+        int fd = vfs_lookup(path, walk_flags(oflag) | WALK_REGULAR);
+        if (fd < 0) {
+                errno = fd;
+                return -1;
         }
         
@@ -406 +407 @@
                 ((oflag & O_APPEND) ? MODE_APPEND : 0);
         
-        int rc = _vfs_open(ret, mode); 
+        int rc = _vfs_open(fd, mode); 
         if (rc < 0) {
-                // _vfs_put(ret);
-                close(ret);
-                return rc;
+                close(fd);
+                errno = rc;
+                return -1;
         }
         
@@ -417 +418 @@
                 assert(!(oflag & O_APPEND));
                 
-                // _vfs_resize
-                (void) ftruncate(ret, 0);
-        }
-
-        return ret;
+                (void) ftruncate(fd, 0);
+        }
+
+        return fd;
 }
 
@@ -723 +723 @@
         int fd = vfs_lookup(path, 0);
         if (fd < 0) {
-                return fd;
+                errno = fd;
+                return -1;
         }
         
         int rc = fstat(fd, stat);
-        close(fd);
+        if (rc != EOK) {
+                close(fd);
+                errno = rc;
+                rc = -1;
+        } else
+                rc = close(fd);
+
         return rc;
 }
@@ -745 +752 @@
         }
         
-        int ret = vfs_lookup(dirname, WALK_DIRECTORY);
-        if (ret < 0) {
+        int fd = vfs_lookup(dirname, WALK_DIRECTORY);
+        if (fd < 0) {
                 free(dirp);
-                errno = ret;
+                errno = fd;
                 return NULL;
         }
         
-        int rc = _vfs_open(ret, MODE_READ);
+        int rc = _vfs_open(fd, MODE_READ);
         if (rc < 0) {
                 free(dirp);
-                close(ret);
+                close(fd);
                 errno = rc;
                 return NULL;
         }
         
-        dirp->fd = ret;
+        dirp->fd = fd;
         return dirp;
 }
@@ -818 +825 @@
 int mkdir(const char *path, mode_t mode)
 {
-        int ret = vfs_lookup(path, WALK_MUST_CREATE | WALK_DIRECTORY);
-        if (ret < 0) {
-                return ret;
-        }
-        
-        close(ret);
-        return EOK;
+        int fd = vfs_lookup(path, WALK_MUST_CREATE | WALK_DIRECTORY);
+        if (fd < 0) {
+                errno = fd;
+                return -1;
+        }
+        
+        return close(fd);
 }
 
@@ -858 +865 @@
         char *pa = vfs_absolutize(path, &pa_size);
         if (!pa) {
-                return ENOMEM;
+                errno = ENOMEM;
+                return -1;
         }
         
@@ -864 +872 @@
         if (root < 0) {
                 free(pa);
-                return ENOENT;
+                errno = ENOENT;
+                return -1;
         }
         
         int rc = _vfs_unlink2(root, pa, -1, 0);
         
+        if (rc != EOK) {
+                errno = rc;
+                rc = -1;
+        }
+
         free(pa);
         close(root);
@@ -884 +898 @@
         char *pa = vfs_absolutize(path, &pa_size);
         if (!pa) {
-                return ENOMEM;
+                errno = ENOMEM;
+                return -1;
         }
         
@@ -890 +905 @@
         if (root < 0) {
                 free(pa);
-                return ENOENT;
+                errno = ENOENT;
+                return -1;
         }
         
         int rc = _vfs_unlink2(root, pa, -1, WALK_DIRECTORY);
+
+        if (rc != EOK) {
+                errno = rc;
+                rc = -1;
+        }
         
         free(pa);
@@ -933 +954 @@
                 free(olda);
                 free(newa);
-                return ENOENT;
+                errno = ENOENT;
+                return -1;
         }
         
@@ -1000 +1022 @@
         size_t abs_size;
         char *abs = vfs_absolutize(path, &abs_size);
-        if (!abs)
-                return ENOMEM;
+        if (!abs) {
+                errno = ENOMEM;
+                return -1;
+        }
         
         int fd = vfs_lookup(abs, WALK_DIRECTORY);
@@ -1134 +1158 @@
         dir = opendir(path);
         if (!dir)
-                return -1;
+                return ENOENT;
 
         while ((dirent = readdir(dir)) != NULL) {
@@ -1144 +1168 @@
                 if (rc < 0) {
                         closedir(dir);
-                        errno = rc;
-                        return -1;
+                        return rc;
                 }
 
@@ -1152 +1175 @@
                         free(child);
                         closedir(dir);
-                        errno = rc;
-                        return -1;
+                        return rc;
                 }