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-ca525b4f24a1a27ffe5dfc8d04c55227ca335ba0.tar.gz | |
*: 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; enum { version2 = 0 }; #endif -#define PROGRAM_VERSION "1.2 - 11/11/96" static smallint repair, automatic, verbose, list, show, warn_mode, force; static smallint changed; /* is filesystem modified? */ static smallint errors_uncorrected; /* flag if some error was not corrected */ @@ -1315,7 +1314,7 @@ int fsck_minix_main(int argc, char **argv) * flags and whether or not the -f switch was specified on the * command line. */ - printf("%s, "PROGRAM_VERSION"\n", applet_name); + printf("%s: %s\n", applet_name, bb_banner); if (!(Super.s_state & MINIX_ERROR_FS) && (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 { int dev_fd; #if ENABLE_FEATURE_MINIX2 - int version2; + smallint version2; #define version2 G.version2 #endif char *device_name; |