1
1

Modified output of --version key.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Этот коммит содержится в:
Andrew Borodin 2010-11-25 16:31:05 +03:00
родитель bbf1f4e857
Коммит 5ec2e4507c

Просмотреть файл

@ -54,7 +54,7 @@ static const char *const vfs_supported[] = {
"extfs",
#endif
#ifdef ENABLE_VFS_UNDELFS
"undelfs",
"ext2undelfs",
#endif
#ifdef ENABLE_VFS_FTP
"ftpfs",
@ -70,35 +70,26 @@ static const char *const vfs_supported[] = {
#endif /* ENABLE_VFS */
static const char *const features[] = {
#ifdef USE_INTERNAL_EDIT
N_("With builtin Editor\n"),
#endif
#ifdef HAVE_SLANG
N_("Using system-installed S-Lang library"),
" ",
N_("with terminfo database"),
N_("Using the S-Lang library with terminfo database\n"),
#elif defined(USE_NCURSES)
N_("Using the ncurses library"),
N_("Using the ncurses library\n"),
#elif defined(USE_NCURSESW)
N_("Using the ncursesw library"),
N_("Using the ncursesw library\n"),
#else
#error "Cannot compile mc without S-Lang or ncurses"
#endif /* !HAVE_SLANG && !USE_NCURSES */
"\n",
#ifdef USE_INTERNAL_EDIT
N_("With builtin Editor\n"),
#endif
#ifdef HAVE_SUBSHELL_SUPPORT
#ifdef SUBSHELL_OPTIONAL
N_("With optional subshell support"),
N_("With optional subshell support\n"),
#else
N_("With subshell support as default"),
N_("With subshell support as default\n"),
#endif
"\n",
#endif /* !HAVE_SUBSHELL_SUPPORT */
#ifdef WITH_BACKGROUND
@ -140,17 +131,19 @@ show_version (void)
printf (_("GNU Midnight Commander %s\n"), VERSION);
printf (_("Built with GLib %d.%d.%d\n"),
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
for (i = 0; features[i] != NULL; i++)
printf ("%s", _(features[i]));
#ifdef ENABLE_VFS
printf (_("Virtual File Systems:"));
for (i = 0; vfs_supported[i] != NULL; i++)
printf ("%s %s", i == 0 ? "" : ",", _(vfs_supported[i]));
printf ("\n");
#endif /* ENABLE_VFS */
for (i = 0; features[i] != NULL; i++)
printf ("%s", _(features[i]));
(void) printf (_("Data types:"));
#define TYPE_INFO(T) \
(void)printf(" %s: %d;", #T, (int) (CHAR_BIT * sizeof(T)))