Changeset 163fc09 in mainline

Timestamp:

2017-04-02T11:47:52Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ce04ea44

Parents:

151f1cc

Message:

Rename rename() to vfs_rename_path()

Location:

uspace

Files:

• app/bdsh/cmds/modules/mv/mv.c (modified) (2 diffs)
• app/tester/vfs/vfs1.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (7 diffs)
• lib/c/include/stdio.h (modified) (1 diff)
• lib/c/include/vfs/vfs.h (modified) (1 diff)
• lib/posix/source/stdio.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/mv/mv.c

@@ -30 +30 @@
 #include <stdlib.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 #include "config.h"
 #include "util.h"
@@ -59 +60 @@
         }
 
-        rc = rename(argv[1], argv[2]);
-        if (rc != 0) {
+        rc = vfs_rename_path(argv[1], argv[2]);
+        if (rc != EOK) {
                 printf("Unable to rename %s to %s (error=%d)\n",
-                    argv[1], argv[2], errno);
+                    argv[1], argv[2], rc);
                 return CMD_FAILURE;
         }

uspace/app/tester/vfs/vfs1.c

@@ -114 +114 @@
                 return rv;
         
-        if (rename(TEST_FILE, TEST_FILE2) != 0)
-                return "rename() failed";
+        if (vfs_rename_path(TEST_FILE, TEST_FILE2) != EOK)
+                return "vfs_rename_path() failed";
         TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2);
         

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

@@ -833 +833 @@
  * @param new New name
  *
- * @return 0 on success. On error returns -1 and sets errno.
- */
-int rename(const char *old, const char *new)
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_rename_path(const char *old, const char *new)
 {
         sysarg_t rc;
@@ -843 +843 @@
         size_t olda_size;
         char *olda = vfs_absolutize(old, &olda_size);
-        if (olda == NULL) {
-                errno = ENOMEM;
-                return -1;
-        }
+        if (olda == NULL)
+                return ENOMEM;
 
         size_t newa_size;
@@ -852 +850 @@
         if (newa == NULL) {
                 free(olda);
-                errno = ENOMEM;
-                return -1;
+                return ENOMEM;
         }
         
@@ -861 +858 @@
                 free(olda);
                 free(newa);
-                errno = ENOENT;
-                return -1;
+                return ENOENT;
         }
         
@@ -875 +871 @@
                 if (rc_orig != EOK)
                         rc = rc_orig;
-                if (rc != EOK) {
-                        errno = rc;
-                        return -1;
-                }
-                return 0;
+                return rc;
         }
         rc = async_data_write_start(exch, newa, newa_size);
@@ -890 +882 @@
                 if (rc_orig != EOK)
                         rc = rc_orig;
-                if (rc != EOK) {
-                        errno = rc;
-                        return -1;
-                }
-                return 0;
+                return rc;
         }
         vfs_exchange_end(exch);
@@ -902 +890 @@
         async_wait_for(req, &rc);
 
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-
-        return 0;
+        return rc;
 }
 

uspace/lib/c/include/stdio.h

@@ -141 +141 @@
 extern void setbuf(FILE *, void *);
 
-/* Misc file functions */
-extern int rename(const char *, const char *);
-
 #endif
 

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

@@ -96 +96 @@
 extern int vfs_open(int, int);
 extern int vfs_put(int);
+extern int vfs_rename_path(const char *, const char *);
 extern int vfs_resize(int, aoff64_t);
 extern int vfs_root(void);

uspace/lib/posix/source/stdio.c

@@ -590 +590 @@
 int posix_rename(const char *old, const char *new)
 {
-        return negerrno(rename, old, new);
+        int rc = rcerrno(vfs_rename_path, old, new);
+        if (rc != EOK)
+                return -1;
+        else
+                return 0;
 }