Changeset 35a35651 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2012-05-04T11:31:47Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b00255a

Parents:

f2b3d3e

Message:

Previous work-dir handling only in Bdsh, not in libc

File:

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

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

@@ -58 +58 @@
 static async_sess_t *vfs_sess = NULL;
 
-/* Current (working) directory. */
 static FIBRIL_MUTEX_INITIALIZE(cwd_mutex);
+
 static int cwd_fd = -1;
 static char *cwd_path = NULL;
 static size_t cwd_size = 0;
-
-/* Previous directory. */
-static FIBRIL_MUTEX_INITIALIZE(pwd_mutex);
-static int pwd_fd = -1;
-static char *pwd_path = NULL;
-static size_t pwd_size = 0;
-
 
 /** Start an async exchange on the VFS session.
@@ -758 +751 @@
         fibril_mutex_lock(&cwd_mutex);
         
-
-        fibril_mutex_lock(&pwd_mutex);
-
-        if (pwd_fd >= 0)
-                close(pwd_fd);
-
-
-        if (pwd_path)
-                free(pwd_path);
-
-
-        pwd_fd = cwd_fd;
-        pwd_path = cwd_path;
-        pwd_size = cwd_size;
-
-        fibril_mutex_unlock(&pwd_mutex);
-
+        if (cwd_fd >= 0)
+                close(cwd_fd);
+        
+        
+        if (cwd_path)
+                free(cwd_path);
+        
         cwd_fd = fd;
         cwd_path = abs;
@@ -798 +781 @@
         fibril_mutex_unlock(&cwd_mutex);
         
-        return buf;
-}
-
-
-char *getprevwd(char *buf, size_t size)
-{
-        if (size == 0)
-                return NULL;
-
-        fibril_mutex_lock(&pwd_mutex);
-
-        if ((pwd_size == 0) || (size < pwd_size + 1)) {
-                fibril_mutex_unlock(&pwd_mutex);
-                return NULL;
-        }
-
-        str_cpy(buf, size, pwd_path);
-        fibril_mutex_unlock(&pwd_mutex);
-
         return buf;
 }