Changeset 05fb96b in mainline for uspace/srv/fs/mfs/mfs_dentry.c

Timestamp:

2011-09-10T10:58:51Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2f72c67a

Parents:

cccc091 (diff), 40a2af3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:mfs.

File:

• uspace/srv/fs/mfs/mfs_dentry.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_dentry.c

@@ -76 +76 @@
                 d_info->d_inum = conv32(sbi->native, d3->d_inum);
                 memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
+                d_info->d_name[MFS3_MAX_NAME_LEN] = 0;
         } else {
                 const int namelen = longnames ? MFS_L_MAX_NAME_LEN :
@@ -86 +87 @@
                 d_info->d_inum = conv16(sbi->native, d->d_inum);
                 memcpy(d_info->d_name, d->d_name, namelen);
+                d_info->d_name[namelen] = 0;
         }
 
@@ -249 +251 @@
         d_info.d_inum = d_inum;
         memcpy(d_info.d_name, d_name, name_len);
-        d_info.d_name[name_len] = 0;
+        if (name_len < sbi->max_name_len)
+                d_info.d_name[name_len] = 0;
 
         r = mfs_write_dentry(&d_info);