Changeset 9eb3623 in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2009-04-08T18:47:17Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

8be693b

Parents:

6071a8f

Message:

Replace some uses of old string functions in C library.

File:

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

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

@@ -58 +58 @@
 DIR *cwd_dir = NULL;
 char *cwd_path = NULL;
-size_t cwd_len = 0;
+size_t cwd_size = 0;
 
 char *absolutize(const char *path, size_t *retlen)
@@ -66 +66 @@
 
         futex_down(&cwd_futex);
-        size_t len = strlen(path);
+        size_t size = str_size(path);
         if (*path != '/') {
                 if (!cwd_path) {
@@ -72 +72 @@
                         return NULL;
                 }
-                ncwd_path_nc = malloc(cwd_len + 1 + len + 1);
+                ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
                 if (!ncwd_path_nc) {
                         futex_up(&cwd_futex);
                         return NULL;
                 }
-                strcpy(ncwd_path_nc, cwd_path);
-                ncwd_path_nc[cwd_len] = '/';
-                ncwd_path_nc[cwd_len + 1] = '\0';
+                str_ncpy(ncwd_path_nc, cwd_path, cwd_size + 1 + size + 1);
+                ncwd_path_nc[cwd_size] = '/';
+                ncwd_path_nc[cwd_size + 1] = '\0';
         } else {
-                ncwd_path_nc = malloc(len + 1);
+                ncwd_path_nc = malloc(size + 1);
                 if (!ncwd_path_nc) {
                         futex_up(&cwd_futex);
@@ -133 +133 @@
             &answer);
         
-        ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1); 
+        ipcarg_t retval = ipc_data_write_start(phone, name, str_size(name) + 1);
         
         if (retval != EOK) {
@@ -167 +167 @@
                 return res;
         
-        size_t mpa_len;
-        char *mpa = absolutize(mp, &mpa_len);
+        size_t mpa_size;
+        char *mpa = absolutize(mp, &mpa_size);
         if (!mpa)
                 return ENOMEM;
@@ -177 +177 @@
         
         req = async_send_2(vfs_phone, VFS_MOUNT, dev_handle, flags, NULL);
-        rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_len);
+        rc = ipc_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -186 +186 @@
         }
         
-        rc = ipc_data_write_start(vfs_phone, (void *) fs_name, strlen(fs_name));
+        rc = ipc_data_write_start(vfs_phone, (void *) fs_name, str_size(fs_name));
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -209 +209 @@
         aid_t req;
         
-        size_t pa_len;
-        char *pa = absolutize(path, &pa_len);
+        size_t pa_size;
+        char *pa = absolutize(path, &pa_size);
         if (!pa)
                 return ENOMEM;
@@ -219 +219 @@
         
         req = async_send_3(vfs_phone, VFS_OPEN, lflag, oflag, 0, &answer);
-        rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+        rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -385 +385 @@
         aid_t req;
         
-        size_t pa_len;
-        char *pa = absolutize(path, &pa_len);
+        size_t pa_size;
+        char *pa = absolutize(path, &pa_size);
         if (!pa)
                 return ENOMEM;
@@ -395 +395 @@
         
         req = async_send_1(vfs_phone, VFS_MKDIR, mode, NULL);
-        rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+        rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -415 +415 @@
         aid_t req;
         
-        size_t pa_len;
-        char *pa = absolutize(path, &pa_len);
+        size_t pa_size;
+        char *pa = absolutize(path, &pa_size);
         if (!pa)
                 return ENOMEM;
@@ -425 +425 @@
         
         req = async_send_0(vfs_phone, VFS_UNLINK, NULL);
-        rc = ipc_data_write_start(vfs_phone, pa, pa_len);
+        rc = ipc_data_write_start(vfs_phone, pa, pa_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -455 +455 @@
         aid_t req;
         
-        size_t olda_len;
-        char *olda = absolutize(old, &olda_len);
+        size_t olda_size;
+        char *olda = absolutize(old, &olda_size);
         if (!olda)
                 return ENOMEM;
 
-        size_t newa_len;
-        char *newa = absolutize(new, &newa_len);
+        size_t newa_size;
+        char *newa = absolutize(new, &newa_size);
         if (!newa) {
                 free(olda);
@@ -472 +472 @@
         
         req = async_send_0(vfs_phone, VFS_RENAME, NULL);
-        rc = ipc_data_write_start(vfs_phone, olda, olda_len);
+        rc = ipc_data_write_start(vfs_phone, olda, olda_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -481 +481 @@
                 return (int) rc;
         }
-        rc = ipc_data_write_start(vfs_phone, newa, newa_len);
+        rc = ipc_data_write_start(vfs_phone, newa, newa_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -500 +500 @@
 int chdir(const char *path)
 {
-        size_t pa_len;
-        char *pa = absolutize(path, &pa_len);
+        size_t pa_size;
+        char *pa = absolutize(path, &pa_size);
         if (!pa)
                 return ENOMEM;
@@ -517 +517 @@
                 free(cwd_path); 
                 cwd_path = NULL;
-                cwd_len = 0;
+                cwd_size = 0;
         }
         cwd_dir = d;
         cwd_path = pa;
-        cwd_len = pa_len;
+        cwd_size = pa_size;
         futex_up(&cwd_futex);
         return EOK;
@@ -531 +531 @@
                 return NULL;
         futex_down(&cwd_futex);
-        if (size < cwd_len + 1) {
+        if (size < cwd_size + 1) {
                 futex_up(&cwd_futex);
                 return NULL;