Changeset 14c29ba in mainline

Timestamp:

2011-03-11T18:41:48Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ccbc5b56

Parents:

b84175a

Message:

Fix directory entries initialization, mkminix is now ready to be used.

File:

• uspace/app/mkminix/mkminix.c (modified) (4 diffs)

uspace/app/mkminix/mkminix.c

@@ -45 +45 @@
 #include <sys/typefmt.h>
 #include <inttypes.h>
-#include <str.h>
 #include <getopt.h>
 #include <mem.h>
@@ -284 +283 @@
 
         root_block = (void *) malloc(MFS_MIN_BLOCKSIZE);
+        memset(root_block, 0x00, MFS_MIN_BLOCKSIZE);
 
         if (!root_block)
@@ -293 +293 @@
 
                 dentry->d_inum = MFS_ROOT_INO;
-                str_cpy(dentry->d_name, 1, ".");
+                memcpy(dentry->d_name, ".\0", 2);
 
                 NEXT_DENTRY(dentry, sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;
-                str_cpy(dentry->d_name, 2, "..");
+                memcpy(dentry->d_name, "..\0", 3);
         } else {
                 /*Directory entries for V3 filesystem*/
@@ -304 +304 @@
 
                 dentry->d_inum = MFS_ROOT_INO;
-                str_cpy(dentry->d_name, 1, ".");
+                memcpy(dentry->d_name, ".\0", 2);
 
                 NEXT_DENTRY(dentry, sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;
-                str_cpy(dentry->d_name, 2, "..");
+                memcpy(dentry->d_name, "..\0", 3);
         }