diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-13 12:27:17 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-13 12:27:17 +0000 |
| commit | ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0 (patch) | |
| tree | 8ccf1f528aafeeb00368c41be74900db86d43d14 /util-linux | |
| parent | b51fd3525e48c79ef9e854dd357a9cdfdfeef72b (diff) | |
| download | busybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.tar.gz busybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.tar.bz2 busybox-w32-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.zip | |
*: BB_BANNER -> bb_banner (it is not a const or #define)!
correct_password: explain in detail why it is ok to use bb_banner
fsck_minix: make it print bb version, not it's own (outdated/irrelevant) one
Marginal size difference:
text data bss dec hex filename
679119 2700 15632 697451 aa46b busybox_old
679091 2700 15632 697423 aa44f busybox_unstripped
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fsck_minix.c | 3 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 955d66f23..74cccf671 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
| @@ -114,7 +114,6 @@ static smallint version2; | |||
| 114 | enum { version2 = 0 }; | 114 | enum { version2 = 0 }; |
| 115 | #endif | 115 | #endif |
| 116 | 116 | ||
| 117 | #define PROGRAM_VERSION "1.2 - 11/11/96" | ||
| 118 | static smallint repair, automatic, verbose, list, show, warn_mode, force; | 117 | static smallint repair, automatic, verbose, list, show, warn_mode, force; |
| 119 | static smallint changed; /* is filesystem modified? */ | 118 | static smallint changed; /* is filesystem modified? */ |
| 120 | static smallint errors_uncorrected; /* flag if some error was not corrected */ | 119 | static smallint errors_uncorrected; /* flag if some error was not corrected */ |
| @@ -1315,7 +1314,7 @@ int fsck_minix_main(int argc, char **argv) | |||
| 1315 | * flags and whether or not the -f switch was specified on the | 1314 | * flags and whether or not the -f switch was specified on the |
| 1316 | * command line. | 1315 | * command line. |
| 1317 | */ | 1316 | */ |
| 1318 | printf("%s, "PROGRAM_VERSION"\n", applet_name); | 1317 | printf("%s: %s\n", applet_name, bb_banner); |
| 1319 | 1318 | ||
| 1320 | if (!(Super.s_state & MINIX_ERROR_FS) | 1319 | if (!(Super.s_state & MINIX_ERROR_FS) |
| 1321 | && (Super.s_state & MINIX_VALID_FS) && !force | 1320 | && (Super.s_state & MINIX_VALID_FS) && !force |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index ffdb2141e..92d640407 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
| @@ -94,7 +94,7 @@ struct globals { | |||
| 94 | int dev_fd; | 94 | int dev_fd; |
| 95 | 95 | ||
| 96 | #if ENABLE_FEATURE_MINIX2 | 96 | #if ENABLE_FEATURE_MINIX2 |
| 97 | int version2; | 97 | smallint version2; |
| 98 | #define version2 G.version2 | 98 | #define version2 G.version2 |
| 99 | #endif | 99 | #endif |
| 100 | char *device_name; | 100 | char *device_name; |