Changeset d96d9bc in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2017-04-02T20:38:50Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c23275a

Parents:

1e2e5795

Message:

Rename chdir() to vfs_cwd_set() and getcwd() to vfs_cwd_get()

File:

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

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

@@ -808 +808 @@
  *
  * @param path Path
- * @return 0 on success. On error returns -1 and sets errno.
- */
-int chdir(const char *path)
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_cwd_set(const char *path)
 {
         size_t abs_size;
         char *abs = vfs_absolutize(path, &abs_size);
-        if (!abs) {
-                errno = ENOMEM;
-                return -1;
-        }
+        if (!abs)
+                return ENOMEM;
         
         int fd = vfs_lookup(abs, WALK_DIRECTORY);
         if (fd < 0) {
                 free(abs);
-                errno = fd;
-                return -1;
+                return fd;
         }
         
@@ -839 +836 @@
         
         fibril_mutex_unlock(&cwd_mutex);
-        return 0;
+        return EOK;
 }
 
@@ -846 +843 @@
  * @param buf Buffer
  * @param size Size of @a buf
- * @return On success returns @a buf. On failure returns @c NULL and sets errno.
- */
-char *getcwd(char *buf, size_t size)
-{
-        if (size == 0) {
-                errno = EINVAL;
-                return NULL;
-        }
-        
+ * @return EOK on success and a non-negative error code otherwise.
+ */
+int vfs_cwd_get(char *buf, size_t size)
+{
         fibril_mutex_lock(&cwd_mutex);
         
         if ((cwd_size == 0) || (size < cwd_size + 1)) {
                 fibril_mutex_unlock(&cwd_mutex);
-                errno = ERANGE;
-                return NULL;
+                return ERANGE;
         }
         
@@ -866 +857 @@
         fibril_mutex_unlock(&cwd_mutex);
         
-        return buf;
+        return EOK;
 }