diff options
Diffstat (limited to 'util-linux/mkfs_minix.c')
-rw-r--r-- | util-linux/mkfs_minix.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index c8c91123b..b6f958f46 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -202,7 +202,6 @@ struct minix_dir_entry { | |||
202 | 202 | ||
203 | #define BITS_PER_BLOCK (BLOCK_SIZE<<3) | 203 | #define BITS_PER_BLOCK (BLOCK_SIZE<<3) |
204 | 204 | ||
205 | static char *program_name = "mkfs"; | ||
206 | static char *device_name = NULL; | 205 | static char *device_name = NULL; |
207 | static int DEV = -1; | 206 | static int DEV = -1; |
208 | static long BLOCKS = 0; | 207 | static long BLOCKS = 0; |
@@ -264,7 +263,7 @@ static unsigned long req_nr_inodes = 0; | |||
264 | */ | 263 | */ |
265 | static volatile void die(char *str) | 264 | static volatile void die(char *str) |
266 | { | 265 | { |
267 | fprintf(stderr, "%s: %s\n", program_name, str); | 266 | fprintf(stderr, "%s: %s\n", applet_name, str); |
268 | exit(8); | 267 | exit(8); |
269 | } | 268 | } |
270 | 269 | ||
@@ -275,7 +274,7 @@ static volatile void show_usage() | |||
275 | BB_VER, BB_BT); | 274 | BB_VER, BB_BT); |
276 | fprintf(stderr, | 275 | fprintf(stderr, |
277 | "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", | 276 | "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n", |
278 | program_name); | 277 | applet_name); |
279 | #ifndef BB_FEATURE_TRIVIAL_HELP | 278 | #ifndef BB_FEATURE_TRIVIAL_HELP |
280 | fprintf(stderr, "\nMake a MINIX filesystem.\n\n"); | 279 | fprintf(stderr, "\nMake a MINIX filesystem.\n\n"); |
281 | fprintf(stderr, "Options:\n"); | 280 | fprintf(stderr, "Options:\n"); |
@@ -745,8 +744,6 @@ extern int mkfs_minix_main(int argc, char **argv) | |||
745 | char *listfile = NULL; | 744 | char *listfile = NULL; |
746 | int stopIt=FALSE; | 745 | int stopIt=FALSE; |
747 | 746 | ||
748 | if (argc && *argv) | ||
749 | program_name = *argv; | ||
750 | if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) | 747 | if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) |
751 | die("bad inode size"); | 748 | die("bad inode size"); |
752 | #ifdef HAVE_MINIX2 | 749 | #ifdef HAVE_MINIX2 |
@@ -818,7 +815,7 @@ extern int mkfs_minix_main(int argc, char **argv) | |||
818 | version2 = 1; | 815 | version2 = 1; |
819 | #else | 816 | #else |
820 | fprintf(stderr, "%s: not compiled with minix v2 support\n", | 817 | fprintf(stderr, "%s: not compiled with minix v2 support\n", |
821 | program_name, device_name); | 818 | applet_name, device_name); |
822 | exit(-1); | 819 | exit(-1); |
823 | #endif | 820 | #endif |
824 | break; | 821 | break; |