Changeset 038b289 in mainline for uspace/app/mkmfs/mkmfs.c

Timestamp:

2011-09-06T23:34:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

888207c9, c05642d, c0e53ff

Parents:

7e9fce6 (diff), fb7e5a9a (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 MFS improvements from lp:mfs.

File:

• uspace/app/mkmfs/mkmfs.c (moved) (moved from uspace/app/mkminix/mkminix.c ) (7 diffs)

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) {