Changeset 92fd52d7 in mainline for uspace/srv/fs/fat

Timestamp:

2009-04-09T21:16:50Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7afb4a5

Parents:

a2c58f6

Message:

Nuke strcpy() and strcmp().

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (2 diffs)
• fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -63 +63 @@
 {
         int rc;
+        size_t size;
+
         if (!(rc = stricmp(name, component)))
                 return rc;
@@ -70 +72 @@
                  * space for appending an extra '.' to name.
                  */
-                name[strlen(name)] = '.';
-                name[strlen(name) + 1] = '\0';
+                size = str_size(name);
+                name[size] = '.';
+                name[size + 1] = '\0';
                 rc = stricmp(name, component);
         }

uspace/srv/fs/fat/fat_ops.c

@@ -488 +488 @@
         d = (fat_dentry_t *)b->data;
         if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-            strcmp(d->name, FAT_NAME_DOT) == 0) {
+            str_cmp(d->name, FAT_NAME_DOT) == 0) {
                 memset(d, 0, sizeof(fat_dentry_t));
                 strcpy(d->name, FAT_NAME_DOT);
@@ -498 +498 @@
         d++;
         if (fat_classify_dentry(d) == FAT_DENTRY_LAST ||
-            strcmp(d->name, FAT_NAME_DOT_DOT) == 0) {
+            str_cmp(d->name, FAT_NAME_DOT_DOT) == 0) {
                 memset(d, 0, sizeof(fat_dentry_t));
                 strcpy(d->name, FAT_NAME_DOT_DOT);
@@ -938 +938 @@
                 return;
 hit:
-                (void) ipc_data_read_finalize(callid, name, strlen(name) + 1);
+                (void) ipc_data_read_finalize(callid, name, str_size(name) + 1);
                 bytes = (pos - spos) + 1;
         }