Changeset 432a269 in mainline for uspace/srv/fs/mfs/mfs_dentry.c
- Timestamp:
- 2011-09-16T21:13:57Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3a11f17
- Parents:
- c0e53ff (diff), fd07e526 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/fs/mfs/mfs_dentry.c
rc0e53ff r432a269 76 76 d_info->d_inum = conv32(sbi->native, d3->d_inum); 77 77 memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN); 78 d_info->d_name[MFS3_MAX_NAME_LEN] = 0; 78 79 } else { 79 80 const int namelen = longnames ? MFS_L_MAX_NAME_LEN : … … 86 87 d_info->d_inum = conv16(sbi->native, d->d_inum); 87 88 memcpy(d_info->d_name, d->d_name, namelen); 89 d_info->d_name[namelen] = 0; 88 90 } 89 91 … … 249 251 d_info.d_inum = d_inum; 250 252 memcpy(d_info.d_name, d_name, name_len); 251 d_info.d_name[name_len] = 0; 253 if (name_len < sbi->max_name_len) 254 d_info.d_name[name_len] = 0; 252 255 253 256 r = mfs_write_dentry(&d_info);
Note:
See TracChangeset
for help on using the changeset viewer.