Changeset 7a46bfe in mainline

Timestamp:

2011-09-06T20:00:07Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

fb7e5a9a

Parents:

9a0be34

Message:

Rename mkminix —> mkmfs
Rename the directory minixfs —> mfs

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/app/mkmfs/Makefile (moved) (moved from uspace/app/mkminix/Makefile ) (1 diff)
• uspace/app/mkmfs/mkmfs.c (moved) (moved from uspace/app/mkminix/mkminix.c ) (7 diffs)
• uspace/srv/fs/mfs/Makefile (moved) (moved from uspace/srv/fs/minixfs/Makefile )
• uspace/srv/fs/mfs/mfs.c (moved) (moved from uspace/srv/fs/minixfs/mfs.c )
• uspace/srv/fs/mfs/mfs.h (moved) (moved from uspace/srv/fs/minixfs/mfs.h )
• uspace/srv/fs/mfs/mfs_balloc.c (moved) (moved from uspace/srv/fs/minixfs/mfs_balloc.c )
• uspace/srv/fs/mfs/mfs_dentry.c (moved) (moved from uspace/srv/fs/minixfs/mfs_dentry.c )
• uspace/srv/fs/mfs/mfs_inode.c (moved) (moved from uspace/srv/fs/minixfs/mfs_inode.c )
• uspace/srv/fs/mfs/mfs_ops.c (moved) (moved from uspace/srv/fs/minixfs/mfs_ops.c )
• uspace/srv/fs/mfs/mfs_rw.c (moved) (moved from uspace/srv/fs/minixfs/mfs_rw.c )
• uspace/srv/fs/mfs/mfs_utils.c (moved) (moved from uspace/srv/fs/minixfs/mfs_utils.c )

boot/Makefile.common

@@ -102 +102 @@
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
-        $(USPACE_PATH)/srv/fs/minixfs/mfs \
+        $(USPACE_PATH)/srv/fs/mfs/mfs \
         $(USPACE_PATH)/srv/fs/exfat/exfat \
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
@@ -155 +155 @@
         $(USPACE_PATH)/app/locinfo/locinfo \
         $(USPACE_PATH)/app/mkfat/mkfat \
-        $(USPACE_PATH)/app/mkminix/mkminix \
+        $(USPACE_PATH)/app/mkmfs/mkmfs \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \

uspace/Makefile

@@ -48 +48 @@
         app/lsusb \
         app/mkfat \
-        app/mkminix \
+        app/mkmfs \
         app/redir \
         app/sbi \
@@ -83 +83 @@
         srv/fs/fat \
         srv/fs/tmpfs \
-        srv/fs/minixfs \
+        srv/fs/mfs \
         srv/fs/locfs \
         srv/fs/ext2fs \

uspace/app/mkmfs/Makefile

@@ -31 +31 @@
 LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBMINIX_PREFIX)
-BINARY = mkminix
+BINARY = mkmfs
 
 SOURCES = \
-        mkminix.c
+        mkmfs.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/app/mkmfs/mkmfs.c

@@ -33 +33 @@
 
 /**
- * @file        mkminix.c
+ * @file        mkmfs.c
  * @brief       Tool for creating new Minix file systems.
  *
@@ -51 +51 @@
 #include <minix.h>
 
-#define NAME    "mkminix"
+#define NAME    "mkmfs"
 
 #define FREE    0
@@ -83 +83 @@
 };
 
-static void     help_cmd_mkminix(help_level_t level);
+static void     help_cmd_mkmfs(help_level_t level);
 static int      num_of_set_bits(uint32_t n);
 static int      init_superblock(struct mfs_sb_info *sb);
@@ -130 +130 @@
 
         if (argc == 1) {
-                help_cmd_mkminix(HELP_SHORT);
-                printf("Incorrect number of arguments, try `mkminix --help'\n");
+                help_cmd_mkmfs(HELP_SHORT);
+                printf("Incorrect number of arguments, try `mkmfs --help'\n");
                 exit(0);
         }
@@ -139 +139 @@
                 switch (c) {
                 case 'h':
-                        help_cmd_mkminix(HELP_LONG);
+                        help_cmd_mkmfs(HELP_LONG);
                         exit(0);
                 case '1':
@@ -197 +197 @@
 
         if (!device_name) {
-                help_cmd_mkminix(HELP_LONG);
+                help_cmd_mkmfs(HELP_LONG);
                 exit(0);
         }
@@ -705 +705 @@
 }
 
-static void help_cmd_mkminix(help_level_t level)
+static void help_cmd_mkmfs(help_level_t level)
 {
         if (level == HELP_SHORT) {