diff options
| author | Matt Kraai <kraai@debian.org> | 2000-07-12 15:38:49 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2000-07-12 15:38:49 +0000 |
| commit | e58771e73c0d8589a458ede4088f5ba70eff917b (patch) | |
| tree | 46d579ac4ec39719ba3b8d18bbc1c359cc9939c5 /util-linux/fsck_minix.c | |
| parent | e714bce003a1b0e2c49e58fe14af86abc8b31f23 (diff) | |
| download | busybox-w32-e58771e73c0d8589a458ede4088f5ba70eff917b.tar.gz busybox-w32-e58771e73c0d8589a458ede4088f5ba70eff917b.tar.bz2 busybox-w32-e58771e73c0d8589a458ede4088f5ba70eff917b.zip | |
Use global applet_name instead of local versions.
Diffstat (limited to 'util-linux/fsck_minix.c')
| -rw-r--r-- | util-linux/fsck_minix.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 9533f40db..685e0ee6c 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
| @@ -219,7 +219,6 @@ struct minix_dir_entry { | |||
| 219 | 219 | ||
| 220 | #define BITS_PER_BLOCK (BLOCK_SIZE<<3) | 220 | #define BITS_PER_BLOCK (BLOCK_SIZE<<3) |
| 221 | 221 | ||
| 222 | static char *program_name = "fsck.minix"; | ||
| 223 | static char *program_version = "1.2 - 11/11/96"; | 222 | static char *program_version = "1.2 - 11/11/96"; |
| 224 | static char *device_name = NULL; | 223 | static char *device_name = NULL; |
| 225 | static int IN; | 224 | static int IN; |
| @@ -293,7 +292,7 @@ static void show_usage(void) | |||
| 293 | { | 292 | { |
| 294 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", | 293 | fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", |
| 295 | BB_VER, BB_BT); | 294 | BB_VER, BB_BT); |
| 296 | fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n", program_name); | 295 | fprintf(stderr, "Usage: %s [-larvsmf] /dev/name\n", applet_name); |
| 297 | #ifndef BB_FEATURE_TRIVIAL_HELP | 296 | #ifndef BB_FEATURE_TRIVIAL_HELP |
| 298 | fprintf(stderr, | 297 | fprintf(stderr, |
| 299 | "\nPerforms a consistency check for MINIX filesystems.\n\n"); | 298 | "\nPerforms a consistency check for MINIX filesystems.\n\n"); |
| @@ -312,7 +311,7 @@ static void show_usage(void) | |||
| 312 | 311 | ||
| 313 | static void die(const char *str) | 312 | static void die(const char *str) |
| 314 | { | 313 | { |
| 315 | fprintf(stderr, "%s: %s\n", program_name, str); | 314 | fprintf(stderr, "%s: %s\n", applet_name, str); |
| 316 | leave(8); | 315 | leave(8); |
| 317 | } | 316 | } |
| 318 | 317 | ||
| @@ -1367,8 +1366,6 @@ extern int fsck_minix_main(int argc, char **argv) | |||
| 1367 | * that automagically, so we can save a few bytes */ | 1366 | * that automagically, so we can save a few bytes */ |
| 1368 | //atexit(free_name_list); | 1367 | //atexit(free_name_list); |
| 1369 | 1368 | ||
| 1370 | if (argc && *argv) | ||
| 1371 | program_name = *argv; | ||
| 1372 | if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) | 1369 | if (INODE_SIZE * MINIX_INODES_PER_BLOCK != BLOCK_SIZE) |
| 1373 | die("bad inode size"); | 1370 | die("bad inode size"); |
| 1374 | #ifdef HAVE_MINIX2 | 1371 | #ifdef HAVE_MINIX2 |
| @@ -1432,7 +1429,7 @@ extern int fsck_minix_main(int argc, char **argv) | |||
| 1432 | * flags and whether or not the -f switch was specified on the | 1429 | * flags and whether or not the -f switch was specified on the |
| 1433 | * command line. | 1430 | * command line. |
| 1434 | */ | 1431 | */ |
| 1435 | printf("%s, %s\n", program_name, program_version); | 1432 | printf("%s, %s\n", applet_name, program_version); |
| 1436 | if (!(Super.s_state & MINIX_ERROR_FS) && | 1433 | if (!(Super.s_state & MINIX_ERROR_FS) && |
| 1437 | (Super.s_state & MINIX_VALID_FS) && !force) { | 1434 | (Super.s_state & MINIX_VALID_FS) && !force) { |
| 1438 | if (repair) | 1435 | if (repair) |