Skip to content

Commit

Permalink
Print version of libraries and features
Browse files Browse the repository at this point in the history
When reporting the version of Dillo with -v, print also the version of
the libraries it is currently using, as well as the features that were
enabled at build time. Notice the versions are reported by reading them
at runtime, so we can detect the version loaded by the loader,
regardless of which version was used at link time.
  • Loading branch information
rodarima committed Nov 1, 2024
1 parent 3af0530 commit 44dbbeb
Show file tree
Hide file tree
Showing 4 changed files with 155 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ dillo_LDADD = \

dillo_SOURCES = \
dillo.cc \
version.cc \
version.hh \
paths.cc \
paths.hh \
tipwin.cc \
Expand Down
3 changes: 2 additions & 1 deletion src/dillo.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "bw.h"
#include "misc.h"
#include "history.h"
#include "version.hh"

#include "dns.h"
#include "web.hh"
Expand Down Expand Up @@ -441,7 +442,7 @@ int main(int argc, char **argv)
}
break;
case DILLO_CLI_VERSION:
puts("Dillo version " VERSION);
version_print_info();
return 0;
case DILLO_CLI_HELP:
printHelp(argv[0], Options);
Expand Down
126 changes: 126 additions & 0 deletions src/version.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
/*
* Dillo web browser
*
* Copyright 2024 Rodrigo Arias Mallo <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "config.h"

#ifdef ENABLE_TLS
# ifdef HAVE_OPENSSL
# include <openssl/crypto.h> /* OpenSSL_version */
# elif defined(HAVE_MBEDTLS)
# include <mbedtls/version.h>
# endif
#endif

#ifdef ENABLE_PNG
# ifdef HAVE_LIBPNG_PNG_H
# include <libpng/png.h>
# else
# include <png.h>
# endif
#endif

#include <FL/Fl.H>
#include <zlib.h>

#include <stdio.h>

static void print_libs()
{

printf("Libraries:");

/* FLTK only offers a single number */
{
int fltkver = Fl::api_version();
int fltk_maj = fltkver / 10000;
int fltk_min = (fltkver / 100) % 100;
int fltk_pat = fltkver % 100;
printf(" fltk/%d.%d.%d", fltk_maj, fltk_min, fltk_pat);
}

printf(" zlib/%s", zlibVersion());

#ifdef ENABLE_PNG
printf(" png/%s", png_get_libpng_ver(NULL));
#endif

#ifdef HAVE_OPENSSL
{
/* Ugly hack to replace "OpenSSL 3.4.0 22 Oct 2024" with
* "OpenSSL/3.4.0". */
char *ossl = strdup(OpenSSL_version(OPENSSL_VERSION));
char *sp1 = strchr(ossl, ' ');
if (sp1) {
*sp1 = '/';
char *sp2 = strchr(ossl, ' ');
if (sp2) {
*sp2 = '\0';
}
}
printf(" %s", ossl);
}
#elif defined(HAVE_MBEDTLS)
{
char version[128];
mbedtls_version_get_string_full(version);
char *sp1 = strchr(version, ' ');
if (sp1) {
*sp1 = '_';
char *sp2 = strchr(sp1, ' ');
if (sp2) {
*sp2 = '/';
}
}
printf(" %s", version);
}
#endif

printf("\n");
}

static void print_features()
{
printf("Features:"
#ifdef ENABLE_GIF
" GIF"
#endif
#ifdef ENABLE_JPEG
" JPEG"
#endif
#ifdef ENABLE_PNG
" PNG"
#endif
#ifdef ENABLE_SVG
" SVG"
#endif
#if !( defined(DISABLE_XEMBED) || defined(WIN32) || defined(__APPLE__) )
" XEMBED"
#endif
#ifdef ENABLE_TLS
" TLS"
#endif
"\n");
}

void version_print_info(void)
{
printf("Dillo version " VERSION "\n");
print_libs();
print_features();
}
25 changes: 25 additions & 0 deletions src/version.hh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Dillo web browser
*
* Copyright 2024 Rodrigo Arias Mallo <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#ifndef VERSION_HH
#define VERSION_HH

void version_print_info();

#endif /* VERSION_HH */

0 comments on commit 44dbbeb

Please sign in to comment.