Changeset 9b48c06 in mainline

Timestamp:

2013-07-24T22:41:54Z (12 years ago)

Author:

Ji?? Z?rev?cky <zarevucky.jiri@…>

Branches:

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

Children:

ff8c87c

Parents:

3ef62df

Message:

Replace all the other uses of VFS_IN_OPEN.

File:

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

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

@@ -333 +333 @@
 }
 
-static int open_internal(const char *abs, size_t abs_size, int lflag, int oflag)
-{
-        // FIXME: Some applications call this incorrectly.
-        if ((oflag & (O_RDONLY|O_WRONLY|O_RDWR)) == 0) {
-                oflag |= O_RDWR;
-        }
-
-        assert((((oflag & O_RDONLY) != 0) + ((oflag & O_WRONLY) != 0) + ((oflag & O_RDWR) != 0)) == 1);
-        
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_3(exch, VFS_IN_OPEN, lflag, oflag, 0, &answer);
-        sysarg_t rc = async_data_write_start(exch, abs, abs_size);
-        
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-
-                sysarg_t rc_orig;
-                async_wait_for(req, &rc_orig);
-                
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-        
-        vfs_exchange_end(exch);
-        async_wait_for(req, &rc);
-        
-        if (rc != EOK)
-            return (int) rc;
-        
-        return (int) IPC_GET_ARG1(answer);
-}
-
 int open(const char *path, int oflag, ...)
 {
@@ -652 +616 @@
 {
         DIR *dirp = malloc(sizeof(DIR));
-        if (!dirp)
-                return NULL;
+        if (!dirp) {
+                errno = ENOMEM;
+                return NULL;
+        }
         
         size_t abs_size;
@@ -659 +625 @@
         if (!abs) {
                 free(dirp);
-                return NULL;
-        }
-        
-        int ret = open_internal(abs, abs_size, L_DIRECTORY, 0);
+                errno = ENOMEM;
+                return NULL;
+        }
+        
+        int ret = _vfs_walk(-1, abs, WALK_DIRECTORY);
         free(abs);
         
         if (ret < 0) {
                 free(dirp);
+                errno = ret;
+                return NULL;
+        }
+        
+        int rc = _vfs_open(ret, MODE_READ);
+        if (rc < 0) {
+                free(dirp);
+                close(ret);
+                errno = rc;
                 return NULL;
         }
@@ -825 +801 @@
                 return ENOMEM;
         
-        int fd = open_internal(abs, abs_size, L_DIRECTORY, O_DESC);
-        
+        int fd = _vfs_walk(-1, abs, WALK_DIRECTORY);
         if (fd < 0) {
                 free(abs);