Changes in uspace/srv/fs/mfs/mfs_dentry.c [7a46bfe:c2e50d7] in mainline

File:

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

uspace/srv/fs/mfs/mfs_dentry.c

@@ -44 +44 @@
 int
 mfs_read_dentry(struct mfs_node *mnode,
-                     struct mfs_dentry_info *d_info, unsigned index)
+    struct mfs_dentry_info *d_info, unsigned index)
 {
         const struct mfs_instance *inst = mnode->instance;
@@ -57 +57 @@
 
         if (block == 0) {
-                /*End of the dentries list*/
+                /* End of the dentries list */
                 r = EOK;
                 goto out_err;
@@ -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 :
-                                    MFS_MAX_NAME_LEN;
+                    MFS_MAX_NAME_LEN;
 
                 struct mfs_dentry *d;
 
                 d = b->data + dentry_off * (longnames ? MFSL_DIRSIZE :
-                                            MFS_DIRSIZE);
+                    MFS_DIRSIZE);
                 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;
         }
 
@@ -99 +101 @@
 /**Write a directory entry on disk.
  *
- * @param d_info        Pointer to the directory entry structure to write on disk.
- *
- * @return              EOK on success or a negative error code.
+ * @param d_info Pointer to the directory entry structure to write on disk.
+ *
+ * @return       EOK on success or a negative error code.
  */
 int
@@ -166 +168 @@
                 return ENAMETOOLONG;
 
-        /*Search the directory entry to be removed*/
+        /* Search the directory entry to be removed */
         unsigned i;
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize ; ++i) {
@@ -176 +178 @@
 
                 if (name_len == d_name_len &&
-                                !bcmp(d_info.d_name, d_name, name_len)) {
+                    !bcmp(d_info.d_name, d_name, name_len)) {
+
                         d_info.d_inum = 0;
                         r = mfs_write_dentry(&d_info);
@@ -195 +198 @@
  */
 int
-mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum)
+mfs_insert_dentry(struct mfs_node *mnode, const char *d_name,
+    fs_index_t d_inum)
 {
         int r;
@@ -207 +211 @@
                 return ENAMETOOLONG;
 
-        /*Search for an empty dentry*/
+        /* Search for an empty dentry */
         unsigned i;
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
@@ -215 +219 @@
 
                 if (d_info.d_inum == 0) {
-                        /*This entry is not used*/
+                        /* This entry is not used */
                         empty_dentry_found = true;
                         break;
@@ -229 +233 @@
 
                 if (b == 0) {
-                        /*Increase the inode size*/
+                        /* Increase the inode size */
 
                         uint32_t dummy;
@@ -249 +253 @@
         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);