From 062136efb35676dea259ed9a6091ab77e6182f2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Mon, 6 Jun 2022 16:08:05 +0300 Subject: [PATCH] Upstream Links 2.26 --- AUTHORS | 10 + ChangeLog | 41 + INSTALL | 2 +- Makefile.am | 2 +- Makefile.in | 20 +- acconfig.h | 3 + bfu.c | 9 - bookmark.c | 8 +- config-vms.h | 22 +- config.h.in | 18 + configure | 1737 ++++++++++++++++++++------------- configure.in | 39 +- connect.c | 41 +- default.c | 45 +- descrip.mms | 2 +- dip.c | 8 +- dither.c | 4 +- dns.c | 84 +- doh.c | 226 +++++ framebuf.c | 8 +- ftp.c | 12 +- html.c | 2 +- html_tbl.c | 4 + http.c | 49 +- https.c | 2 +- img.c | 28 + intl/bahasa_indonesian.lng | 12 +- intl/belarusian.lng | 12 +- intl/brazilian_portuguese.lng | 12 +- intl/bulgarian.lng | 12 +- intl/catalan.lng | 12 +- intl/croatian.lng | 12 +- intl/czech.lng | 12 +- intl/danish.lng | 12 +- intl/dutch.lng | 12 +- intl/english.lng | 12 +- intl/estonian.lng | 12 +- intl/finnish.lng | 12 +- intl/french.lng | 12 +- intl/galician.lng | 12 +- intl/german.lng | 14 +- intl/greek.lng | 12 +- intl/hungarian.lng | 12 +- intl/icelandic.lng | 12 +- intl/italian.lng | 12 +- intl/lithuanian.lng | 12 +- intl/norwegian.lng | 12 +- intl/polish.lng | 12 +- intl/portuguese.lng | 12 +- intl/romanian.lng | 12 +- intl/russian.lng | 12 +- intl/serbian.lng | 12 +- intl/slovak.lng | 12 +- intl/spanish.lng | 12 +- intl/swedish.lng | 12 +- intl/swiss_german.lng | 14 +- intl/turkish.lng | 12 +- intl/ukrainian.lng | 12 +- intl/upper_sorbian.lng | 12 +- language.h | 1414 ++++++++++++++------------- language.inc | 382 +++++--- links.1 | 16 +- links.h | 62 +- links.wis | 2 +- listedit.c | 2 +- mailto.c | 21 +- menu.c | 132 ++- objreq.c | 10 +- os_dep.c | 3 +- sched.c | 74 +- session.c | 4 +- suffix.inc | 232 ++++- suffix/public_suffix_list.dat | 462 ++++++--- types.c | 7 + url.c | 2 + view.c | 3 +- webp.c | 83 ++ x.c | 2 +- 78 files changed, 3724 insertions(+), 2015 deletions(-) create mode 100644 doh.c create mode 100644 webp.c diff --git a/AUTHORS b/AUTHORS index b7bb433..770417c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -389,3 +389,13 @@ pluvano Ing. Daniel G. Gionco Updated the Spanish translation + +Timur Adamov + Handle the "TD" tag outside "TR" the same way as in other browsers + +zinov@waifu.club: + Fix a bug when form submit url contained '#' + +Martin Michel : + Updated the German translation + Updated the initial bookmarks diff --git a/ChangeLog b/ChangeLog index c022711..b8f8508 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +=== RELEASE 2.26 === + +Wed Apr 6 18:13:16 CEST 2022 mikulas: + + Fix a display glitch if the list is empty and the user presses '*' + +Sat Mar 26 11:09:12 CET 2022 mikulas: + + Add a possibility to pass gopher:// URLs to an external program + +Sat Jan 1 14:46:06 CET 2022 Martin Michel : + + Updated the German translation + Updated the initial bookmarks + +Fri Dec 24 12:47:58 CET 2021 zinov@waifu.club: + + Fix a bug when form submit url contained '#' + +Sun Dec 5 18:17:11 CET 2021 mikulas: + + Support WEBP images + +Fri Dec 3 17:40:55 CET 2021 mikulas: + + Support DNS-over-HTTPS + +Sun Nov 21 11:36:45 CET 2021 mikulas: + + Try multiple IPv4 addresses on systems that don't have getaddrinfo + +Sun Nov 14 20:55:11 CET 2021 Timur Adamov : + + Handle the "TD" tag outside "TR" the same way as in other browsers + +Tue Oct 19 18:42:50 CEST 2021 mikulas: + + Make it possible to bind a socket to a network interface + It could be activated by specifying interface name in the "Bind to local + IP address" box + === RELEASE 2.25 === Fri Oct 1 18:27:25 CEST 2021 mikulas: diff --git a/INSTALL b/INSTALL index b34e72a..6c28568 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -Links 2.25 -- How To Install +Links 2.26 -- How To Install ---------------------------- Follow this step-by-step: diff --git a/Makefile.am b/Makefile.am index 9e0bd83..1bd51c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ if JAVASCRIPT links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o endif -links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc +links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc # builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h dist-hook: diff --git a/Makefile.in b/Makefile.in index a8aff73..626acd7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,7 @@ bin_PROGRAMS = links @HAIKU_GR_TRUE@links_LDADD = haiku.o @JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o -links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc +links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc CXXFLAGS = @CXXFLAGS@ @@ -96,13 +96,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ links_OBJECTS = af_unix.o auth.o beos.o bfu.o block.o bookmark.o \ cache.o charsets.o compress.o connect.o cookies.o data.o default.o \ -dip.o directfb.o dither.o dns.o dos.o drivers.o error.o file.o finger.o \ -fn_impl.o fontconf.o font_inc.o framebuf.o freetype.o ftp.o gif.o grx.o \ -hpux.o html.o html_gr.o html_r.o html_tbl.o http.o https.o img.o \ -imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o mailto.o \ -main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o sched.o \ -select.o session.o smb.o string.o suffix.o svg.o svgalib.o terminal.o \ -tiff.o types.o url.o view.o view_gr.o vms.o x.o xbm.o +dip.o directfb.o dither.o dns.o doh.o dos.o drivers.o error.o file.o \ +finger.o fn_impl.o fontconf.o font_inc.o framebuf.o freetype.o ftp.o \ +gif.o grx.o hpux.o html.o html_gr.o html_r.o html_tbl.o http.o https.o \ +img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \ +mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \ +sched.o select.o session.o smb.o string.o suffix.o svg.o svgalib.o \ +terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o @ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o @JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \ @JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \ @@ -382,6 +382,8 @@ dither.o: dither.c cfg.h config.h links.h com-defs.h os_dep.h os_depx.h \ setup.h language.h codepage.h bits.h dns.o: dns.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ setup.h language.h codepage.h +doh.o: doh.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ + setup.h language.h codepage.h dos.o: dos.c drivers.o: drivers.c cfg.h config.h links.h com-defs.h os_dep.h \ os_depx.h setup.h language.h codepage.h @@ -481,6 +483,8 @@ view.o: view.c links.h cfg.h config.h com-defs.h os_dep.h os_depx.h \ view_gr.o: view_gr.c cfg.h config.h links.h com-defs.h os_dep.h \ os_depx.h setup.h language.h codepage.h vms.o: vms.c +webp.o: webp.c cfg.h config.h links.h com-defs.h os_dep.h os_depx.h \ + setup.h language.h codepage.h x.o: x.c cfg.h config.h links.h com-defs.h os_dep.h os_depx.h setup.h \ language.h codepage.h xbm.o: xbm.c cfg.h config.h links.h com-defs.h os_dep.h os_depx.h \ diff --git a/acconfig.h b/acconfig.h index be88567..a4f7b05 100644 --- a/acconfig.h +++ b/acconfig.h @@ -241,5 +241,8 @@ /* SVG */ #undef HAVE_SVG +/* WebP */ +#undef HAVE_WEBP + /* Gpm_Event has wdx and wdy */ #undef HAVE_WDX_WDY diff --git a/bfu.c b/bfu.c index 612cc62..7592bae 100644 --- a/bfu.c +++ b/bfu.c @@ -1666,15 +1666,6 @@ static int check_local_ip_address_internal(struct dialog_data *dlg, struct dialo if (!*p) { return 0; } -#ifdef SUPPORT_IPV6 - if (pf == PF_INET6) rs = numeric_ipv6_address(p, NULL, NULL); - else -#endif - rs = numeric_ip_address(p, NULL); - if (rs) { - msg_box(dlg->win->term, NULL, TEXT_(T_BAD_IP_ADDRESS), AL_CENTER, TEXT_(T_INVALID_IP_ADDRESS_SYNTAX), MSG_BOX_END, NULL, 1, TEXT_(T_CANCEL), msg_box_null, B_ENTER | B_ESC); - return 1; - } s = socket_and_bind(pf, p); if (s != -1) { EINTRLOOP(rs, close(s)); diff --git a/bookmark.c b/bookmark.c index 3d4cc7c..17c0252 100644 --- a/bookmark.c +++ b/bookmark.c @@ -512,12 +512,12 @@ static void create_initial_bookmarks(void) { add_bookmark(cast_uchar "Links", NULL, 0); add_bookmark(cast_uchar "English", NULL, 1); - add_bookmark(cast_uchar "Calibration Procedure", cast_uchar "http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/calibration.html", 2); - add_bookmark(cast_uchar "Links Homepage", cast_uchar "http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/", 2); + add_bookmark(cast_uchar "Calibration Procedure", cast_uchar "http://links.twibright.com/calibration.html", 2); + add_bookmark(cast_uchar "Links Homepage", cast_uchar "http://links.twibright.com/", 2); add_bookmark(cast_uchar "Links Manual", cast_uchar "http://links.twibright.com/user_en.html", 2); add_bookmark(cast_uchar "Cesky", NULL, 1); - add_bookmark(cast_uchar "Kalibracni procedura", cast_uchar "http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/kalibrace.html", 2); - add_bookmark(cast_uchar "Links: domaci stranka", cast_uchar "http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/index_cz.html", 2); + add_bookmark(cast_uchar "Kalibracni procedura", cast_uchar "http://links.twibright.com/kalibrace.html", 2); + add_bookmark(cast_uchar "Links: domaci stranka", cast_uchar "http://links.twibright.com/index_cz.php", 2); add_bookmark(cast_uchar "Manual k Linksu", cast_uchar "http://links.twibright.com/user.html", 2); } diff --git a/config-vms.h b/config-vms.h index ab78c72..8c61063 100644 --- a/config-vms.h +++ b/config-vms.h @@ -126,6 +126,15 @@ /* Define if you have the SSL_set_security_level function. */ /* #undef HAVE_SSL_SET_SECURITY_LEVEL */ +/* Define if you have the WebPDecodeRGBA function. */ +/* #undef HAVE_WEBPDECODERGBA */ + +/* Define if you have the WebPFree function. */ +/* #undef HAVE_WEBPFREE */ + +/* Define if you have the X509_VERIFY_PARAM_set_flags function. */ +/* #undef HAVE_X509_VERIFY_PARAM_SET_FLAGS */ + /* Define if you have the X509_check_host function. */ /* #undef HAVE_X509_CHECK_HOST */ @@ -798,6 +807,9 @@ /* Define if you have the header file. */ /* #undef HAVE_VALUES_H */ +/* Define if you have the header file. */ +/* #undef HAVE_WEBP_DECODE_H */ + /* Define if you have the header file. */ /* #undef HAVE_WINDOWSX_H */ @@ -897,6 +909,9 @@ /* Define if you have the watt library (-lwatt). */ /* #undef HAVE_LIBWATT */ +/* Define if you have the webp library (-lwebp). */ +/* #undef HAVE_LIBWEBP */ + /* Define if you have the x86 library (-lx86). */ /* #undef HAVE_LIBX86 */ @@ -919,11 +934,11 @@ #define PACKAGE "links" /* Version number of package */ -#define VERSION "2.25" +#define VERSION "2.26" /* */ -#define VERSION "2.25" +#define VERSION "2.26" /* */ /* #undef HAVE_OPENMP */ @@ -1156,5 +1171,8 @@ /* SVG */ /* #undef HAVE_SVG */ +/* WebP */ +/* #undef HAVE_WEBP */ + /* Gpm_Event has wdx and wdy */ /* #undef HAVE_WDX_WDY */ diff --git a/config.h.in b/config.h.in index 19d7cd8..16b976c 100644 --- a/config.h.in +++ b/config.h.in @@ -125,6 +125,15 @@ /* Define if you have the SSL_set_security_level function. */ #undef HAVE_SSL_SET_SECURITY_LEVEL +/* Define if you have the WebPDecodeRGBA function. */ +#undef HAVE_WEBPDECODERGBA + +/* Define if you have the WebPFree function. */ +#undef HAVE_WEBPFREE + +/* Define if you have the X509_VERIFY_PARAM_set_flags function. */ +#undef HAVE_X509_VERIFY_PARAM_SET_FLAGS + /* Define if you have the X509_check_host function. */ #undef HAVE_X509_CHECK_HOST @@ -818,6 +827,9 @@ /* Define if you have the header file. */ #undef HAVE_VALUES_H +/* Define if you have the header file. */ +#undef HAVE_WEBP_DECODE_H + /* Define if you have the header file. */ #undef HAVE_WINDOWSX_H @@ -920,6 +932,9 @@ /* Define if you have the watt library (-lwatt). */ #undef HAVE_LIBWATT +/* Define if you have the webp library (-lwebp). */ +#undef HAVE_LIBWEBP + /* Define if you have the x86 library (-lx86). */ #undef HAVE_LIBX86 @@ -1185,5 +1200,8 @@ /* SVG */ #undef HAVE_SVG +/* WebP */ +#undef HAVE_WEBP + /* Gpm_Event has wdx and wdy */ #undef HAVE_WDX_WDY diff --git a/configure b/configure index 2ff8ec4..20948c4 100755 --- a/configure +++ b/configure @@ -85,6 +85,10 @@ ac_help="$ac_help --without-librsvg compile without SVG support" ac_help="$ac_help --disable-svg-pkgconfig don't use pkgconfig when searching for librsvg" +ac_help="$ac_help + --without-libwebp compile without WEBP support" +ac_help="$ac_help + --disable-webp-pkgconfig don't use pkgconfig when searching for librwebp" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -628,7 +632,7 @@ am__api_version="1.4" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:634: checking for a BSD compatible install" >&5 +echo "configure:638: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -681,7 +685,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:687: checking whether build environment is sane" >&5 +echo "configure:691: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -738,7 +742,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:744: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:748: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -767,7 +771,7 @@ fi PACKAGE=links -VERSION=2.25 +VERSION=2.26 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -784,7 +788,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:790: checking for working aclocal-${am__api_version}" >&5 +echo "configure:794: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -797,7 +801,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:803: checking for working autoconf" >&5 +echo "configure:807: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -810,7 +814,7 @@ else fi echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:816: checking for working automake-${am__api_version}" >&5 +echo "configure:820: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -823,7 +827,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:829: checking for working autoheader" >&5 +echo "configure:833: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -836,7 +840,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:842: checking for working makeinfo" >&5 +echo "configure:846: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -868,7 +872,7 @@ export LIBS # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:874: checking for $ac_word" >&5 +echo "configure:878: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -898,7 +902,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:904: checking for $ac_word" >&5 +echo "configure:908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -949,7 +953,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:955: checking for $ac_word" >&5 +echo "configure:959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -981,7 +985,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:987: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:991: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -992,12 +996,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 998 "configure" +#line 1002 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1023,12 +1027,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1029: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1033: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1034: checking whether we are using GNU C" >&5 +echo "configure:1038: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1037,7 +1041,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1056,7 +1060,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1062: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1066: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1102,7 +1106,7 @@ if test -n "`uname|grep -i bsd`"; then fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1108: checking how to run the C preprocessor" >&5 +echo "configure:1112: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1117,13 +1121,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1134,13 +1138,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1151,13 +1155,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1182,12 +1186,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1188: checking for ANSI C header files" >&5 +echo "configure:1192: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1195,7 +1199,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1212,7 +1216,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1230,7 +1234,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1251,7 +1255,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1262,7 +1266,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1287,13 +1291,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1293: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1297: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1311,7 +1315,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1335,12 +1339,12 @@ fi echo $ac_n "checking for EMX""... $ac_c" 1>&6 -echo "configure:1341: checking for EMX" >&5 +echo "configure:1345: checking for EMX" >&5 if eval "test \"`echo '$''{'ac_cv_have_emx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_emx=yes else @@ -1371,12 +1375,12 @@ if test "$ac_cv_have_emx" = yes; then fi echo $ac_n "checking for OpenWatcom""... $ac_c" 1>&6 -echo "configure:1377: checking for OpenWatcom" >&5 +echo "configure:1381: checking for OpenWatcom" >&5 if eval "test \"`echo '$''{'ac_cv_have_watcom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_watcom=yes else @@ -1402,12 +1406,12 @@ echo "$ac_t""$ac_cv_have_watcom" 1>&6 test "$ac_cv_have_watcom" = yes && ac_cv_lib_dir_opendir=no echo $ac_n "checking for DJGPP""... $ac_c" 1>&6 -echo "configure:1408: checking for DJGPP" >&5 +echo "configure:1412: checking for DJGPP" >&5 if eval "test \"`echo '$''{'ac_cv_have_djgpp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_djgpp=yes else @@ -1438,12 +1442,12 @@ if test "$ac_cv_have_djgpp" = yes; then fi echo $ac_n "checking for ARM64 ILP32""... $ac_c" 1>&6 -echo "configure:1444: checking for ARM64 ILP32" >&5 +echo "configure:1448: checking for ARM64 ILP32" >&5 if eval "test \"`echo '$''{'ac_cv_have_arm64_ilp32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_arm64_ilp32=yes else @@ -1469,12 +1473,12 @@ echo "$ac_t""$ac_cv_have_arm64_ilp32" 1>&6 test "$ac_cv_have_arm64_ilp32" = yes && disable_openmp=yes echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:1475: checking for volatile" >&5 +echo "configure:1479: checking for volatile" >&5 if eval "test \"`echo '$''{'ac_cv_have_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_volatile=yes else @@ -1506,12 +1510,12 @@ EOF fi echo $ac_n "checking for restrict""... $ac_c" 1>&6 -echo "configure:1512: checking for restrict" >&5 +echo "configure:1516: checking for restrict" >&5 if eval "test \"`echo '$''{'ac_cv_have_restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_restrict=yes else @@ -1548,12 +1552,12 @@ EOF fi echo $ac_n "checking for __restrict""... $ac_c" 1>&6 -echo "configure:1554: checking for __restrict" >&5 +echo "configure:1558: checking for __restrict" >&5 if eval "test \"`echo '$''{'ac_cv_have___restrict'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have___restrict=yes else @@ -1590,19 +1594,19 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:1596: checking for long long" >&5 +echo "configure:1600: checking for long long" >&5 if eval "test \"`echo '$''{'ac_cv_have_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_long_long=yes else @@ -1622,7 +1626,7 @@ EOF echo $ac_n "checking for pointer comparison bug""... $ac_c" 1>&6 -echo "configure:1628: checking for pointer comparison bug" >&5 +echo "configure:1632: checking for pointer comparison bug" >&5 if eval "test \"`echo '$''{'ac_cv_pointer_comparison_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1635,7 +1639,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pointer_comparison_bug=no else @@ -1668,7 +1672,7 @@ EOF if test "$ac_cv_have_long_long" = yes -a "$ac_cv_have_volatile" = yes; then echo $ac_n "checking for maxint conversion bug""... $ac_c" 1>&6 -echo "configure:1674: checking for maxint conversion bug" >&5 +echo "configure:1678: checking for maxint conversion bug" >&5 if eval "test \"`echo '$''{'ac_cv_maxint_conversion_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1681,7 +1685,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_maxint_conversion_bug=no else @@ -1715,19 +1719,19 @@ fi echo $ac_n "checking for stdlib.h""... $ac_c" 1>&6 -echo "configure:1721: checking for stdlib.h" >&5 +echo "configure:1725: checking for stdlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_have_stdlib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_stdlib_h=yes else @@ -1754,12 +1758,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1760: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1764: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1767,7 +1771,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1792,7 +1796,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1798: checking for opendir in -ldir" >&5 +echo "configure:1802: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1800,7 +1804,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1833,7 +1837,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1839: checking for opendir in -lx" >&5 +echo "configure:1843: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1841,7 +1845,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1875,12 +1879,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1881: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1885: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1896,7 +1900,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1920,17 +1924,17 @@ for ac_hdr in alloca.h arpa/inet.h bsd/string.h cygwin/process.h cygwin/version. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1926: checking for $ac_hdr" >&5 +echo "configure:1930: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1962,12 +1966,12 @@ if test "$ac_cv_header_stdarg_h" != yes; then fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1968: checking for working const" >&5 +echo "configure:1972: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2037,21 +2041,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2043: checking for inline" >&5 +echo "configure:2047: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2077,12 +2081,12 @@ EOF esac echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2083: checking for size_t" >&5 +echo "configure:2087: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2110,12 +2114,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2116: checking for pid_t" >&5 +echo "configure:2120: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2143,12 +2147,12 @@ EOF fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:2149: checking for socklen_t" >&5 +echo "configure:2153: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_have_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2161,7 +2165,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_socklen_t=yes else @@ -2182,12 +2186,12 @@ EOF fi echo $ac_n "checking for errno""... $ac_c" 1>&6 -echo "configure:2188: checking for errno" >&5 +echo "configure:2192: checking for errno" >&5 if eval "test \"`echo '$''{'ac_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2199,7 +2203,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_errno=yes else @@ -2221,12 +2225,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2227: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2231: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2235,7 +2239,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2256,12 +2260,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2262: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2266: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2269,7 +2273,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2303,7 +2307,7 @@ else fi echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6 -echo "configure:2309: checking size of unsigned short" >&5 +echo "configure:2313: checking size of unsigned short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2311,7 +2315,7 @@ else ac_cv_sizeof_unsigned_short="$default_short" else cat > conftest.$ac_ext < #include @@ -2323,7 +2327,7 @@ main() exit(0); } EOF -if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_short=`cat conftestval` else @@ -2343,7 +2347,7 @@ EOF echo $ac_n "checking size of unsigned""... $ac_c" 1>&6 -echo "configure:2349: checking size of unsigned" >&5 +echo "configure:2353: checking size of unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2351,7 +2355,7 @@ else ac_cv_sizeof_unsigned="$default_int" else cat > conftest.$ac_ext < #include @@ -2363,7 +2367,7 @@ main() exit(0); } EOF -if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned=`cat conftestval` else @@ -2383,7 +2387,7 @@ EOF echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2389: checking size of unsigned long" >&5 +echo "configure:2393: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2391,7 +2395,7 @@ else ac_cv_sizeof_unsigned_long="$default_long" else cat > conftest.$ac_ext < #include @@ -2403,7 +2407,7 @@ main() exit(0); } EOF -if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2424,7 +2428,7 @@ EOF if test "$ac_cv_have_long_long" = yes; then echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6 -echo "configure:2430: checking size of unsigned long long" >&5 +echo "configure:2434: checking size of unsigned long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2432,7 +2436,7 @@ else ac_cv_sizeof_unsigned_long_long="$default_long_long" else cat > conftest.$ac_ext < #include @@ -2444,7 +2448,7 @@ main() exit(0); } EOF -if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long_long=`cat conftestval` else @@ -2468,7 +2472,7 @@ if test "$ac_cv_sizeof_unsigned" -ne 0 && test "$ac_cv_sizeof_unsigned" -lt 4; t { echo "configure: error: integer must have at least 32 bits" 1>&2; exit 1; } fi echo $ac_n "checking for big endian""... $ac_c" 1>&6 -echo "configure:2474: checking for big endian" >&5 +echo "configure:2478: checking for big endian" >&5 if eval "test \"`echo '$''{'ac_cv_big_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2476,7 +2480,7 @@ else ac_cv_big_endian=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_big_endian=yes else @@ -2505,7 +2509,7 @@ fi echo "$ac_t""$ac_cv_big_endian" 1>&6 echo $ac_n "checking for little endian""... $ac_c" 1>&6 -echo "configure:2511: checking for little endian" >&5 +echo "configure:2515: checking for little endian" >&5 if eval "test \"`echo '$''{'ac_cv_little_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2513,7 +2517,7 @@ else ac_cv_little_endian="$ac_cv_have_emx" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_little_endian=yes else @@ -2556,7 +2560,7 @@ fi fi echo $ac_n "checking if rename can replace existing files""... $ac_c" 1>&6 -echo "configure:2562: checking if rename can replace existing files" >&5 +echo "configure:2566: checking if rename can replace existing files" >&5 if eval "test \"`echo '$''{'ac_cv_rename_over_existing_files'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2564,7 +2568,7 @@ else ac_cv_rename_over_existing_files=no else cat > conftest.$ac_ext < @@ -2583,7 +2587,7 @@ else } EOF -if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_rename_over_existing_files=yes else @@ -2608,12 +2612,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2614: checking return type of signal handlers" >&5 +echo "configure:2618: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2630,7 +2634,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2649,12 +2653,12 @@ EOF echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2655: checking for strftime" >&5 +echo "configure:2659: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2699,7 +2703,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2705: checking for strftime in -lintl" >&5 +echo "configure:2709: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2707,7 +2711,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2745,12 +2749,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2751: checking for vprintf" >&5 +echo "configure:2755: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2797,12 +2801,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2803: checking for _doprnt" >&5 +echo "configure:2807: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2852,12 +2856,12 @@ fi for ac_func in bcmp bcopy bzero calloc cfmakeraw chmod cygwin_conv_path cygwin_conv_to_full_win32_path dirfd fallocate freelocale getcwd getgrgid gethostname getpagesize getpid getpwuid getrlimit gettimeofday gmtime kqueue malloc_trim mallopt mktime newlocale nl_langinfo poll popen posix_fallocate raise select setlocale setpgid setrlimit setsid sigaction sigblock sigdelset sigprocmask sigsetmask snprintf strdup strerror_l strptime strtod strtoimax strtol strtoll strtoq strtoul sysconf tdelete tempnam tfind timegm tsearch uname unixpath2win utime utimes uwin_path winpath2unix _heapmin _msize _ucreate _udefault _udestroy _uopen __strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2858: checking for $ac_func" >&5 +echo "configure:2862: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2909,12 +2913,12 @@ done for ac_func in strlen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2915: checking for $ac_func" >&5 +echo "configure:2919: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2962,19 +2966,19 @@ fi done echo $ac_n "checking for strlen""... $ac_c" 1>&6 -echo "configure:2968: checking for strlen" >&5 +echo "configure:2972: checking for strlen" >&5 if eval "test \"`echo '$''{'ac_cv_have_strlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return strlen(str); ; return 0; } EOF -if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strlen=yes else @@ -2998,12 +3002,12 @@ fi for ac_func in strnlen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3004: checking for $ac_func" >&5 +echo "configure:3008: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3051,19 +3055,19 @@ fi done echo $ac_n "checking for strnlen""... $ac_c" 1>&6 -echo "configure:3057: checking for strnlen" >&5 +echo "configure:3061: checking for strnlen" >&5 if eval "test \"`echo '$''{'ac_cv_have_strnlen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return strnlen(str, 3); ; return 0; } EOF -if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strnlen=yes else @@ -3087,12 +3091,12 @@ fi for ac_func in strcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3093: checking for $ac_func" >&5 +echo "configure:3097: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3140,19 +3144,19 @@ fi done echo $ac_n "checking for strcpy""... $ac_c" 1>&6 -echo "configure:3146: checking for strcpy" >&5 +echo "configure:3150: checking for strcpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; strcpy(a, str); return a[0]; ; return 0; } EOF -if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcpy=yes else @@ -3176,12 +3180,12 @@ fi for ac_func in strncpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3182: checking for $ac_func" >&5 +echo "configure:3186: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3229,19 +3233,19 @@ fi done echo $ac_n "checking for strncpy""... $ac_c" 1>&6 -echo "configure:3235: checking for strncpy" >&5 +echo "configure:3239: checking for strncpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_strncpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; strncpy(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strncpy=yes else @@ -3265,12 +3269,12 @@ fi for ac_func in strchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3271: checking for $ac_func" >&5 +echo "configure:3275: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3318,19 +3322,19 @@ fi done echo $ac_n "checking for strchr""... $ac_c" 1>&6 -echo "configure:3324: checking for strchr" >&5 +echo "configure:3328: checking for strchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return !!strchr(str, 0); ; return 0; } EOF -if { (eval echo configure:3336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strchr=yes else @@ -3354,12 +3358,12 @@ fi for ac_func in strrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3360: checking for $ac_func" >&5 +echo "configure:3364: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3407,19 +3411,19 @@ fi done echo $ac_n "checking for strrchr""... $ac_c" 1>&6 -echo "configure:3413: checking for strrchr" >&5 +echo "configure:3417: checking for strrchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strrchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; return !!strrchr(str, 0); ; return 0; } EOF -if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strrchr=yes else @@ -3443,12 +3447,12 @@ fi for ac_func in strcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3449: checking for $ac_func" >&5 +echo "configure:3453: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3496,19 +3500,19 @@ fi done echo $ac_n "checking for strcmp""... $ac_c" 1>&6 -echo "configure:3502: checking for strcmp" >&5 +echo "configure:3506: checking for strcmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strcmp(str2, str); ; return 0; } EOF -if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcmp=yes else @@ -3532,12 +3536,12 @@ fi for ac_func in strncmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3538: checking for $ac_func" >&5 +echo "configure:3542: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3585,19 +3589,19 @@ fi done echo $ac_n "checking for strncmp""... $ac_c" 1>&6 -echo "configure:3591: checking for strncmp" >&5 +echo "configure:3595: checking for strncmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_strncmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; return strncmp(str2, str, l); ; return 0; } EOF -if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strncmp=yes else @@ -3621,12 +3625,12 @@ fi for ac_func in strcspn do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3627: checking for $ac_func" >&5 +echo "configure:3631: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3674,19 +3678,19 @@ fi done echo $ac_n "checking for strcspn""... $ac_c" 1>&6 -echo "configure:3680: checking for strcspn" >&5 +echo "configure:3684: checking for strcspn" >&5 if eval "test \"`echo '$''{'ac_cv_have_strcspn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strcspn(str2, str); ; return 0; } EOF -if { (eval echo configure:3692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strcspn=yes else @@ -3710,12 +3714,12 @@ fi for ac_func in strspn do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3716: checking for $ac_func" >&5 +echo "configure:3720: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3763,19 +3767,19 @@ fi done echo $ac_n "checking for strspn""... $ac_c" 1>&6 -echo "configure:3769: checking for strspn" >&5 +echo "configure:3773: checking for strspn" >&5 if eval "test \"`echo '$''{'ac_cv_have_strspn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return strspn(str2, str); ; return 0; } EOF -if { (eval echo configure:3781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strspn=yes else @@ -3799,12 +3803,12 @@ fi for ac_func in strstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3805: checking for $ac_func" >&5 +echo "configure:3809: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3852,19 +3856,19 @@ fi done echo $ac_n "checking for strstr""... $ac_c" 1>&6 -echo "configure:3858: checking for strstr" >&5 +echo "configure:3862: checking for strstr" >&5 if eval "test \"`echo '$''{'ac_cv_have_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; return !!strstr(str2, str); ; return 0; } EOF -if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strstr=yes else @@ -3888,12 +3892,12 @@ fi for ac_func in memchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3894: checking for $ac_func" >&5 +echo "configure:3898: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3941,19 +3945,19 @@ fi done echo $ac_n "checking for memchr""... $ac_c" 1>&6 -echo "configure:3947: checking for memchr" >&5 +echo "configure:3951: checking for memchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_memchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; volatile int l = 1; return !!memchr(str, 0, l); ; return 0; } EOF -if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memchr=yes else @@ -3977,12 +3981,12 @@ fi for ac_func in memrchr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3983: checking for $ac_func" >&5 +echo "configure:3987: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4030,19 +4034,19 @@ fi done echo $ac_n "checking for memrchr""... $ac_c" 1>&6 -echo "configure:4036: checking for memrchr" >&5 +echo "configure:4040: checking for memrchr" >&5 if eval "test \"`echo '$''{'ac_cv_have_memrchr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; volatile int l = 1; return !!memrchr(str, 0, l); ; return 0; } EOF -if { (eval echo configure:4048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memrchr=yes else @@ -4066,12 +4070,12 @@ fi for ac_func in memcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4072: checking for $ac_func" >&5 +echo "configure:4076: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4119,19 +4123,19 @@ fi done echo $ac_n "checking for memcmp""... $ac_c" 1>&6 -echo "configure:4125: checking for memcmp" >&5 +echo "configure:4129: checking for memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_memcmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; return memcmp(str2, str, l); ; return 0; } EOF -if { (eval echo configure:4137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memcmp=yes else @@ -4155,12 +4159,12 @@ fi for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4161: checking for $ac_func" >&5 +echo "configure:4165: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4208,19 +4212,19 @@ fi done echo $ac_n "checking for memcpy""... $ac_c" 1>&6 -echo "configure:4214: checking for memcpy" >&5 +echo "configure:4218: checking for memcpy" >&5 if eval "test \"`echo '$''{'ac_cv_have_memcpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; memcpy(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memcpy=yes else @@ -4244,12 +4248,12 @@ fi for ac_func in memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4250: checking for $ac_func" >&5 +echo "configure:4254: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4297,19 +4301,19 @@ fi done echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:4303: checking for memmove" >&5 +echo "configure:4307: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_have_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char * volatile str = ""; char a[100]; volatile int l = 1; memmove(a, str, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memmove=yes else @@ -4333,12 +4337,12 @@ fi for ac_func in memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4339: checking for $ac_func" >&5 +echo "configure:4343: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4386,19 +4390,19 @@ fi done echo $ac_n "checking for memset""... $ac_c" 1>&6 -echo "configure:4392: checking for memset" >&5 +echo "configure:4396: checking for memset" >&5 if eval "test \"`echo '$''{'ac_cv_have_memset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char a[100]; char * volatile str = a; volatile int l = 1; memset(str, 0, l); return a[0]; ; return 0; } EOF -if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memset=yes else @@ -4422,12 +4426,12 @@ fi for ac_func in memmem do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4428: checking for $ac_func" >&5 +echo "configure:4432: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4475,12 +4479,12 @@ fi done echo $ac_n "checking for memmem""... $ac_c" 1>&6 -echo "configure:4481: checking for memmem" >&5 +echo "configure:4485: checking for memmem" >&5 if eval "test \"`echo '$''{'ac_cv_have_memmem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4488,7 +4492,7 @@ int main() { char * volatile str = ""; char * volatile str2 = ""; volatile int l = 1; volatile int l2 = 1; return !!memmem(str2, l2, str, l); ; return 0; } EOF -if { (eval echo configure:4494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_memmem=yes else @@ -4512,12 +4516,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4518: checking for $ac_func" >&5 +echo "configure:4522: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4565,19 +4569,19 @@ fi done echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:4571: checking for strerror" >&5 +echo "configure:4575: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_have_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile int e = 1; return strerror(e)[0]; ; return 0; } EOF -if { (eval echo configure:4583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_strerror=yes else @@ -4599,19 +4603,19 @@ EOF fi echo $ac_n "checking for sigfillset""... $ac_c" 1>&6 -echo "configure:4605: checking for sigfillset" >&5 +echo "configure:4609: checking for sigfillset" >&5 if eval "test \"`echo '$''{'ac_cv_have_sigfillset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sigset_t set; sigfillset(&set); ; return 0; } EOF -if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_sigfillset=yes else @@ -4633,19 +4637,19 @@ EOF fi echo $ac_n "checking for sigsetjmp/siglongjmp""... $ac_c" 1>&6 -echo "configure:4639: checking for sigsetjmp/siglongjmp" >&5 +echo "configure:4643: checking for sigsetjmp/siglongjmp" >&5 if eval "test \"`echo '$''{'ac_cv_have_sigsetjmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sigjmp_buf env;sigsetjmp(env, 1);siglongjmp(env, 2); ; return 0; } EOF -if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_sigsetjmp=yes else @@ -4667,7 +4671,7 @@ EOF fi echo $ac_n "checking for gcc assembler""... $ac_c" 1>&6 -echo "configure:4673: checking for gcc assembler" >&5 +echo "configure:4677: checking for gcc assembler" >&5 if eval "test \"`echo '$''{'ac_cv_have_gcc_assembler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4675,7 +4679,7 @@ else ac_cv_have_gcc_assembler="$ac_cv_have_emx" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_gcc_assembler=yes else @@ -4732,19 +4736,19 @@ EOF fi echo $ac_n "checking for __builtin_add_overflow""... $ac_c" 1>&6 -echo "configure:4738: checking for __builtin_add_overflow" >&5 +echo "configure:4742: checking for __builtin_add_overflow" >&5 if eval "test \"`echo '$''{'ac_cv_have___builtin_add_overflow'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have___builtin_add_overflow=yes else @@ -4766,19 +4770,19 @@ EOF fi echo $ac_n "checking for __builtin_clz""... $ac_c" 1>&6 -echo "configure:4772: checking for __builtin_clz" >&5 +echo "configure:4776: checking for __builtin_clz" >&5 if eval "test \"`echo '$''{'ac_cv_have___builtin_clz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have___builtin_clz=yes else @@ -4805,7 +4809,7 @@ if test "$ac_cv_func_select" != yes; then fi echo $ac_n "checking for strmode in -lbsd""... $ac_c" 1>&6 -echo "configure:4811: checking for strmode in -lbsd" >&5 +echo "configure:4815: checking for strmode in -lbsd" >&5 ac_lib_var=`echo bsd'_'strmode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4813,7 +4817,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4854,7 +4858,7 @@ fi echo $ac_n "checking for requested debug level""... $ac_c" 1>&6 -echo "configure:4860: checking for requested debug level" >&5 +echo "configure:4864: checking for requested debug level" >&5 # Check whether --enable-debuglevel or --disable-debuglevel was given. if test "${enable_debuglevel+set}" = set; then enableval="$enable_debuglevel" @@ -4875,7 +4879,7 @@ EOF echo $ac_n "checking if you want to enable javascript""... $ac_c" 1>&6 -echo "configure:4881: checking if you want to enable javascript" >&5 +echo "configure:4885: checking if you want to enable javascript" >&5 cf_use_javascript=no # Check whether --enable-javascript or --disable-javascript was given. if test "${enable_javascript+set}" = set; then @@ -4890,7 +4894,7 @@ if test "$cf_use_javascript" = yes; then EOF echo $ac_n "checking if you want to link with system libfl""... $ac_c" 1>&6 -echo "configure:4896: checking if you want to link with system libfl" >&5 +echo "configure:4900: checking if you want to link with system libfl" >&5 cf_use_libfl=no # Check whether --with-libfl or --without-libfl was given. if test "${with_libfl+set}" = set; then @@ -4916,7 +4920,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4922: checking for $ac_word" >&5 +echo "configure:4926: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4960,19 +4964,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpcre""... $ac_c" 1>&6 -echo "configure:4966: checking for libpcre" >&5 +echo "configure:4970: checking for libpcre" >&5 if $PKG_CONFIG --exists "libpcre" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPCRE_CFLAGS""... $ac_c" 1>&6 -echo "configure:4973: checking LIBPCRE_CFLAGS" >&5 +echo "configure:4977: checking LIBPCRE_CFLAGS" >&5 LIBPCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre"` echo "$ac_t""$LIBPCRE_CFLAGS" 1>&6 echo $ac_n "checking LIBPCRE_LIBS""... $ac_c" 1>&6 -echo "configure:4978: checking LIBPCRE_LIBS" >&5 +echo "configure:4982: checking LIBPCRE_LIBS" >&5 LIBPCRE_LIBS=`$PKG_CONFIG --libs "libpcre"` echo "$ac_t""$LIBPCRE_LIBS" 1>&6 else @@ -5003,7 +5007,7 @@ echo "configure:4978: checking LIBPCRE_LIBS" >&5 LIBS="$LIBPCRE_LIBS $LIBS" fi echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 -echo "configure:5009: checking for pcre_compile in -lpcre" >&5 +echo "configure:5013: checking for pcre_compile in -lpcre" >&5 ac_lib_var=`echo pcre'_'pcre_compile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5011,7 +5015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcre $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5053,17 +5057,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5059: checking for $ac_hdr" >&5 +echo "configure:5063: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5099,12 +5103,12 @@ EOF for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5105: checking for $ac_func" >&5 +echo "configure:5109: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5155,17 +5159,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5161: checking for $ac_hdr" >&5 +echo "configure:5165: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5200,7 +5204,7 @@ EOF fi fi echo $ac_n "checking for fmod in -lm""... $ac_c" 1>&6 -echo "configure:5206: checking for fmod in -lm" >&5 +echo "configure:5210: checking for fmod in -lm" >&5 ac_lib_var=`echo m'_'fmod | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5208,7 +5212,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5250,7 +5254,7 @@ fi cf_use_graphics=no echo $ac_n "checking if you want to use graphics""... $ac_c" 1>&6 -echo "configure:5256: checking if you want to use graphics" >&5 +echo "configure:5260: checking if you want to use graphics" >&5 # Check whether --enable-graphics or --disable-graphics was given. if test "${enable_graphics+set}" = set; then enableval="$enable_graphics" @@ -5260,7 +5264,7 @@ fi echo "$ac_t""$cf_use_graphics" 1>&6 echo $ac_n "checking if you want to enable UTF-8 terminal""... $ac_c" 1>&6 -echo "configure:5266: checking if you want to enable UTF-8 terminal" >&5 +echo "configure:5270: checking if you want to enable UTF-8 terminal" >&5 cf_enable_utf8=yes # Check whether --enable-utf8 or --disable-utf8 was given. if test "${enable_utf8+set}" = set; then @@ -5284,12 +5288,12 @@ fi for ac_func in clock_gettime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5290: checking for $ac_func" >&5 +echo "configure:5294: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5338,7 +5342,7 @@ done if test $ac_cv_func_clock_gettime = no; then echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 -echo "configure:5344: checking for clock_gettime in -lrt" >&5 +echo "configure:5348: checking for clock_gettime in -lrt" >&5 ac_lib_var=`echo rt'_'clock_gettime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5346,7 +5350,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5393,12 +5397,12 @@ EOF fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:5399: checking for socket" >&5 +echo "configure:5403: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -5443,7 +5447,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:5449: checking for socket in -lsocket" >&5 +echo "configure:5453: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5451,7 +5455,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5491,7 +5495,7 @@ fi if test "$ac_cv_lib_socket_socket" = no; then echo $ac_n "checking for socket in -lxnet""... $ac_c" 1>&6 -echo "configure:5497: checking for socket in -lxnet" >&5 +echo "configure:5501: checking for socket in -lxnet" >&5 ac_lib_var=`echo xnet'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5499,7 +5503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5539,7 +5543,7 @@ fi if test "$ac_cv_lib_xnet_socket" = no; then echo $ac_n "checking for socket in -lnetwork""... $ac_c" 1>&6 -echo "configure:5545: checking for socket in -lnetwork" >&5 +echo "configure:5549: checking for socket in -lnetwork" >&5 ac_lib_var=`echo network'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5547,7 +5551,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnetwork $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5587,7 +5591,7 @@ fi if test "$ac_cv_lib_network_socket" = no; then echo $ac_n "checking for socket in -lwatt""... $ac_c" 1>&6 -echo "configure:5593: checking for socket in -lwatt" >&5 +echo "configure:5597: checking for socket in -lwatt" >&5 ac_lib_var=`echo watt'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5595,7 +5599,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwatt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5641,12 +5645,12 @@ fi fi fi echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 -echo "configure:5647: checking for setsockopt" >&5 +echo "configure:5651: checking for setsockopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setsockopt=yes" else @@ -5691,7 +5695,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 -echo "configure:5697: checking for setsockopt in -lsocket" >&5 +echo "configure:5701: checking for setsockopt in -lsocket" >&5 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5699,7 +5703,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5740,12 +5744,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5746: checking for gethostbyname" >&5 +echo "configure:5750: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5790,7 +5794,7 @@ fi if test "$cf_result" = no; then echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6 -echo "configure:5796: checking for gethostbyname in -lsocket" >&5 +echo "configure:5800: checking for gethostbyname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5798,7 +5802,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5839,7 +5843,7 @@ fi cf_result="$ac_cv_lib_socket_gethostbyname" if test "$ac_cv_lib_socket_gethostbyname" = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5845: checking for gethostbyname in -lnsl" >&5 +echo "configure:5849: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5847,7 +5851,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5895,7 +5899,7 @@ EOF if test "$cf_result" = yes && test "$ac_cv_have_watcom" = yes -o "`uname -s`" = SunOS; then echo $ac_n "checking for flawed gethostbyname""... $ac_c" 1>&6 -echo "configure:5901: checking for flawed gethostbyname" >&5 +echo "configure:5905: checking for flawed gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_gethostbyname_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5903,7 +5907,7 @@ else ac_cv_gethostbyname_bug="$ac_cv_have_watcom" else cat > conftest.$ac_ext < @@ -5913,7 +5917,7 @@ else } EOF -if { (eval echo configure:5919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_gethostbyname_bug=no else @@ -5946,12 +5950,12 @@ if test "$disable_getaddrinfo" != yes; then for ac_func in getaddrinfo freeaddrinfo gai_strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5952: checking for $ac_func" >&5 +echo "configure:5956: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6010,12 +6014,12 @@ fi for ac_func in inet_ntop inet_pton herror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6016: checking for $ac_func" >&5 +echo "configure:6020: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6071,12 +6075,12 @@ fi echo $ac_n "checking for ipv6""... $ac_c" 1>&6 -echo "configure:6077: checking for ipv6" >&5 +echo "configure:6081: checking for ipv6" >&5 if eval "test \"`echo '$''{'ac_cv_have_ipv6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6090,7 +6094,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_ipv6=yes else @@ -6114,12 +6118,12 @@ else cf_have_ipv6=no fi echo $ac_n "checking for sockaddr_in6.sin6_scope_id""... $ac_c" 1>&6 -echo "configure:6120: checking for sockaddr_in6.sin6_scope_id" >&5 +echo "configure:6124: checking for sockaddr_in6.sin6_scope_id" >&5 if eval "test \"`echo '$''{'ac_cv_have_sin6_scope_id'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6133,7 +6137,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_sin6_scope_id=yes else @@ -6165,17 +6169,17 @@ if test "$disable_libevent" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6171: checking for $ac_hdr" >&5 +echo "configure:6175: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6203,7 +6207,7 @@ done if test "$ac_cv_header_event_h" = yes; then echo $ac_n "checking for event_loop in -levent""... $ac_c" 1>&6 -echo "configure:6209: checking for event_loop in -levent" >&5 +echo "configure:6213: checking for event_loop in -levent" >&5 ac_lib_var=`echo event'_'event_loop | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6211,7 +6215,7 @@ else ac_save_LIBS="$LIBS" LIBS="-levent $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6256,7 +6260,7 @@ fi if test "$cf_have_libevent" = no; then if test "$ac_cv_header_event_h" = yes -o "$ac_cv_header_ev_event_h" = yes; then echo $ac_n "checking for event_loop in -lev""... $ac_c" 1>&6 -echo "configure:6262: checking for event_loop in -lev" >&5 +echo "configure:6266: checking for event_loop in -lev" >&5 ac_lib_var=`echo ev'_'event_loop | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6264,7 +6268,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lev $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6312,12 +6316,12 @@ if test "$cf_have_libevent" != no; then for ac_func in event_base_set event_get_version event_get_method event_base_free event_base_new event_reinit event_base_get_method event_config_set_flag event_get_struct_event_size do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6318: checking for $ac_func" >&5 +echo "configure:6322: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6368,7 +6372,7 @@ fi if test "$cf_use_graphics" != no; then echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:6374: checking for pow in -lm" >&5 +echo "configure:6378: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6376,7 +6380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6416,7 +6420,7 @@ fi if test "$ac_cv_lib_m_pow" = no; then echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6422: checking for main in -lm" >&5 +echo "configure:6426: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6424,14 +6428,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6460,19 +6464,19 @@ fi fi echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:6466: checking for pow" >&5 +echo "configure:6470: checking for pow" >&5 if eval "test \"`echo '$''{'ac_cv_have_pow'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile double a = 1.1; volatile double b = 2.2; return pow(a, b); ; return 0; } EOF -if { (eval echo configure:6478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_pow=yes else @@ -6493,19 +6497,19 @@ EOF fi echo $ac_n "checking for powf""... $ac_c" 1>&6 -echo "configure:6499: checking for powf" >&5 +echo "configure:6503: checking for powf" >&5 if eval "test \"`echo '$''{'ac_cv_have_powf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { volatile float a = 1.1; volatile float b = 2.2; return powf(a, b); ; return 0; } EOF -if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_powf=yes else @@ -6542,17 +6546,17 @@ if test "$disable_gpm" != yes -a "$ac_cv_have_djgpp" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6548: checking for $ac_hdr" >&5 +echo "configure:6552: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6579,7 +6583,7 @@ fi done echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:6585: checking for Gpm_Open in -lgpm" >&5 +echo "configure:6589: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6587,7 +6591,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6628,12 +6632,12 @@ fi for ac_func in Gpm_GetLibVersion do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6634: checking for $ac_func" >&5 +echo "configure:6638: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6683,12 +6687,12 @@ done if test "$ac_cv_lib_gpm_Gpm_Open" = yes && test "$ac_cv_header_gpm_h" = yes; then cf_have_gpm=yes echo $ac_n "checking for Gpm_Event wdx and wdy""... $ac_c" 1>&6 -echo "configure:6689: checking for Gpm_Event wdx and wdy" >&5 +echo "configure:6693: checking for Gpm_Event wdx and wdy" >&5 if eval "test \"`echo '$''{'ac_cv_have_wdx_wdy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6703,7 +6707,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_wdx_wdy=yes else @@ -6731,21 +6735,21 @@ else fi echo $ac_n "checking for OS/2 threads""... $ac_c" 1>&6 -echo "configure:6737: checking for OS/2 threads" >&5 +echo "configure:6741: checking for OS/2 threads" >&5 if eval "test \"`echo '$''{'ac_cv_have_beginthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else CFLAGS_X="$CFLAGS" CFLAGS="$CFLAGS -Zmt" cat > conftest.$ac_ext < int main() { _beginthread(NULL, NULL, 0, NULL) ; return 0; } EOF -if { (eval echo configure:6751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_beginthread=yes else @@ -6771,17 +6775,17 @@ for ac_hdr in atheos/threads.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6777: checking for $ac_hdr" >&5 +echo "configure:6781: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6810,12 +6814,12 @@ done for ac_func in spawn_thread resume_thread do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6816: checking for $ac_func" >&5 +echo "configure:6820: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6866,12 +6870,12 @@ done for ac_func in MouOpen _read_kbd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6872: checking for $ac_func" >&5 +echo "configure:6876: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6919,7 +6923,7 @@ fi done echo $ac_n "checking for XFree for OS/2""... $ac_c" 1>&6 -echo "configure:6925: checking for XFree for OS/2" >&5 +echo "configure:6929: checking for XFree for OS/2" >&5 if eval "test \"`echo '$''{'ac_cv_have_x2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6930,14 +6934,14 @@ else CPPFLAGS="$CPPFLAGS_X -I$X11ROOT/XFree86/include" LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86_gcc" cat > conftest.$ac_ext < int main() { struct winsize win;ptioctl(1, TIOCGWINSZ, &win) ; return 0; } EOF -if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_x2=xf86_gcc else @@ -6950,14 +6954,14 @@ rm -f conftest* if test "$ac_cv_have_x2" = no; then LIBS="$LIBS_X -L$X11ROOT/XFree86/lib -lxf86" cat > conftest.$ac_ext < int main() { struct winsize win;ptioctl(1, TIOCGWINSZ, &win) ; return 0; } EOF -if { (eval echo configure:6963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_x2=xf86 else @@ -7007,7 +7011,7 @@ if test -z "$disable_ssl"; then LIBS_X="$LIBS" if test "$static_link" != 0; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7013: checking for dlopen in -ldl" >&5 +echo "configure:7017: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7015,7 +7019,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7054,7 +7058,7 @@ else fi echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:7060: checking for inflate in -lz" >&5 +echo "configure:7064: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7062,7 +7066,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7114,7 +7118,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7120: checking for $ac_word" >&5 +echo "configure:7124: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7158,19 +7162,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for openssl""... $ac_c" 1>&6 -echo "configure:7164: checking for openssl" >&5 +echo "configure:7168: checking for openssl" >&5 if $PKG_CONFIG --exists "openssl" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking OPENSSL_CFLAGS""... $ac_c" 1>&6 -echo "configure:7171: checking OPENSSL_CFLAGS" >&5 +echo "configure:7175: checking OPENSSL_CFLAGS" >&5 OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl"` echo "$ac_t""$OPENSSL_CFLAGS" 1>&6 echo $ac_n "checking OPENSSL_LIBS""... $ac_c" 1>&6 -echo "configure:7176: checking OPENSSL_LIBS" >&5 +echo "configure:7180: checking OPENSSL_LIBS" >&5 OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl"` echo "$ac_t""$OPENSSL_LIBS" 1>&6 else @@ -7202,11 +7206,11 @@ echo "configure:7176: checking OPENSSL_LIBS" >&5 fi if test "$pkgconfig_openssl" = yes; then echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 -echo "configure:7208: checking for OpenSSL" >&5 +echo "configure:7212: checking for OpenSSL" >&5 CPPFLAGS="$CPPFLAGS_XX $OPENSSL_CFLAGS" LIBS="$OPENSSL_LIBS $LIBS_XX" cat > conftest.$ac_ext < #include @@ -7214,7 +7218,7 @@ int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=openssl else @@ -7230,7 +7234,7 @@ rm -f conftest* if test "$cf_result" = no && test "$ssld" != nss; then echo $ac_n "checking for OpenSSL""... $ac_c" 1>&6 -echo "configure:7236: checking for OpenSSL" >&5 +echo "configure:7240: checking for OpenSSL" >&5 if test "$ssld" = yes -o "$ssld" = openssl; then ssld=". /usr /usr/local /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/local/www /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl" fi @@ -7244,7 +7248,7 @@ echo "configure:7236: checking for OpenSSL" >&5 CPPFLAGS="$CPPFLAGS_XX" fi cat > conftest.$ac_ext < #include @@ -7252,7 +7256,7 @@ int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=openssl else @@ -7278,7 +7282,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7284: checking for $ac_word" >&5 +echo "configure:7288: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7322,19 +7326,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for nss""... $ac_c" 1>&6 -echo "configure:7328: checking for nss" >&5 +echo "configure:7332: checking for nss" >&5 if $PKG_CONFIG --exists "nss" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking NSS_CFLAGS""... $ac_c" 1>&6 -echo "configure:7335: checking NSS_CFLAGS" >&5 +echo "configure:7339: checking NSS_CFLAGS" >&5 NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` echo "$ac_t""$NSS_CFLAGS" 1>&6 echo $ac_n "checking NSS_LIBS""... $ac_c" 1>&6 -echo "configure:7340: checking NSS_LIBS" >&5 +echo "configure:7344: checking NSS_LIBS" >&5 NSS_LIBS=`$PKG_CONFIG --libs "nss"` echo "$ac_t""$NSS_LIBS" 1>&6 else @@ -7371,16 +7375,16 @@ echo "configure:7340: checking NSS_LIBS" >&5 CPPFLAGS="$CPPFLAGS_X $NSS_CFLAGS" LIBS="-lnss_compat_ossl $NSS_LIBS $LIBS_X" echo $ac_n "checking for NSS-compat-ossl""... $ac_c" 1>&6 -echo "configure:7377: checking for NSS-compat-ossl" >&5 +echo "configure:7381: checking for NSS-compat-ossl" >&5 cat > conftest.$ac_ext < int main() { SSL_CTX_new((void *)0) ; return 0; } EOF -if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=nss else @@ -7413,17 +7417,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7419: checking for $ac_hdr" >&5 +echo "configure:7423: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7456,15 +7460,15 @@ done EOF fi - for ac_func in ASN1_STRING_get0_data ASN1_STRING_to_UTF8 OPENSSL_cleanup OPENSSL_init_ssl RAND_add RAND_egd RAND_file_name RAND_load_file RAND_write_file SSL_SESSION_is_resumable SSL_get0_verified_chain SSL_get1_peer_certificate SSL_get1_session SSL_load_error_strings SSL_set_security_level X509_check_host X509_check_ip + for ac_func in ASN1_STRING_get0_data ASN1_STRING_to_UTF8 OPENSSL_cleanup OPENSSL_init_ssl RAND_add RAND_egd RAND_file_name RAND_load_file RAND_write_file SSL_SESSION_is_resumable SSL_get0_verified_chain SSL_get1_peer_certificate SSL_get1_session SSL_load_error_strings SSL_set_security_level X509_VERIFY_PARAM_set_flags X509_check_host X509_check_ip do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7465: checking for $ac_func" >&5 +echo "configure:7469: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7512,12 +7516,12 @@ fi done echo $ac_n "checking for CRYPTO_set_mem_functions without file/line""... $ac_c" 1>&6 -echo "configure:7518: checking for CRYPTO_set_mem_functions without file/line" >&5 +echo "configure:7522: checking for CRYPTO_set_mem_functions without file/line" >&5 if eval "test \"`echo '$''{'ac_cv_have_crypto_set_mem_functions_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < static int csmf(void *(*m)(size_t), void *(*r)(void *, size_t), void (*f)(void *)) { return 0; } @@ -7526,7 +7530,7 @@ int main() { return (int)(CRYPTO_set_mem_functions - csmf); ; return 0; } EOF -if { (eval echo configure:7532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_crypto_set_mem_functions_1=yes else @@ -7547,12 +7551,12 @@ EOF fi echo $ac_n "checking for CRYPTO_set_mem_functions with file/line""... $ac_c" 1>&6 -echo "configure:7553: checking for CRYPTO_set_mem_functions with file/line" >&5 +echo "configure:7557: checking for CRYPTO_set_mem_functions with file/line" >&5 if eval "test \"`echo '$''{'ac_cv_have_crypto_set_mem_functions_2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < static int csmf(void *(*m)(size_t, const char *, int), void *(*r)(void *, size_t, const char *, int), void (*f)(void *, const char *, int)) { return 0; } @@ -7561,7 +7565,7 @@ int main() { return (int)(CRYPTO_set_mem_functions - csmf); ; return 0; } EOF -if { (eval echo configure:7567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_crypto_set_mem_functions_2=yes else @@ -7629,17 +7633,17 @@ if test "$disable_zlib" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7635: checking for $ac_hdr" >&5 +echo "configure:7639: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7666,7 +7670,7 @@ fi done echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:7672: checking for inflate in -lz" >&5 +echo "configure:7676: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7674,7 +7678,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7726,17 +7730,17 @@ if test "$disable_brotli" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7732: checking for $ac_hdr" >&5 +echo "configure:7736: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7763,7 +7767,7 @@ fi done echo $ac_n "checking for BrotliDecoderDecompressStream in -lbrotlidec""... $ac_c" 1>&6 -echo "configure:7769: checking for BrotliDecoderDecompressStream in -lbrotlidec" >&5 +echo "configure:7773: checking for BrotliDecoderDecompressStream in -lbrotlidec" >&5 ac_lib_var=`echo brotlidec'_'BrotliDecoderDecompressStream | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7771,7 +7775,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbrotlidec $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7823,17 +7827,17 @@ if test "$disable_zstd" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7829: checking for $ac_hdr" >&5 +echo "configure:7833: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7860,7 +7864,7 @@ fi done echo $ac_n "checking for ZSTD_decompressStream in -lzstd""... $ac_c" 1>&6 -echo "configure:7866: checking for ZSTD_decompressStream in -lzstd" >&5 +echo "configure:7870: checking for ZSTD_decompressStream in -lzstd" >&5 ac_lib_var=`echo zstd'_'ZSTD_decompressStream | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7868,7 +7872,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lzstd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7910,12 +7914,12 @@ fi for ac_func in ZSTD_getErrorCode do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7916: checking for $ac_func" >&5 +echo "configure:7920: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7975,17 +7979,17 @@ if test "$disable_bzip2" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7981: checking for $ac_hdr" >&5 +echo "configure:7985: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8012,7 +8016,7 @@ fi done echo $ac_n "checking for BZ2_bzDecompress in -lbz2""... $ac_c" 1>&6 -echo "configure:8018: checking for BZ2_bzDecompress in -lbz2" >&5 +echo "configure:8022: checking for BZ2_bzDecompress in -lbz2" >&5 ac_lib_var=`echo bz2'_'BZ2_bzDecompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8020,7 +8024,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8072,17 +8076,17 @@ if test "$disable_lzma" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8078: checking for $ac_hdr" >&5 +echo "configure:8082: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8109,7 +8113,7 @@ fi done echo $ac_n "checking for lzma_auto_decoder in -llzma""... $ac_c" 1>&6 -echo "configure:8115: checking for lzma_auto_decoder in -llzma" >&5 +echo "configure:8119: checking for lzma_auto_decoder in -llzma" >&5 ac_lib_var=`echo lzma'_'lzma_auto_decoder | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8117,7 +8121,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llzma $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8169,17 +8173,17 @@ if test "$disable_lzip" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8175: checking for $ac_hdr" >&5 +echo "configure:8179: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8206,7 +8210,7 @@ fi done echo $ac_n "checking for LZ_decompress_open in -llz""... $ac_c" 1>&6 -echo "configure:8212: checking for LZ_decompress_open in -llz" >&5 +echo "configure:8216: checking for LZ_decompress_open in -llz" >&5 ac_lib_var=`echo lz'_'LZ_decompress_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8214,7 +8218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8280,7 +8284,7 @@ fi cf_have_openmp=no if test "$disable_openmp" != yes; then echo $ac_n "checking for OpenMP""... $ac_c" 1>&6 -echo "configure:8286: checking for OpenMP" >&5 +echo "configure:8290: checking for OpenMP" >&5 if eval "test \"`echo '$''{'ac_cv_have_openmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8289,7 +8293,7 @@ else CFLAGS_X="$CFLAGS" CFLAGS="$CFLAGS $openmp_cflags" cat > conftest.$ac_ext < int main() { @@ -8311,7 +8315,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_openmp="$openmp_cflags" else @@ -8399,7 +8403,7 @@ if test "$disable_svgalib" != yes; then LIBS_X="$LIBS" if test "$static_link" != 0; then echo $ac_n "checking for LRMI_init in -lx86""... $ac_c" 1>&6 -echo "configure:8405: checking for LRMI_init in -lx86" >&5 +echo "configure:8409: checking for LRMI_init in -lx86" >&5 ac_lib_var=`echo x86'_'LRMI_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8407,7 +8411,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx86 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8448,19 +8452,19 @@ fi fi LIBS="-lvga $LIBS" echo $ac_n "checking for svgalib""... $ac_c" 1>&6 -echo "configure:8454: checking for svgalib" >&5 +echo "configure:8458: checking for svgalib" >&5 if eval "test \"`echo '$''{'ac_cv_have_svgalib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { vga_setmode(0) ; return 0; } EOF -if { (eval echo configure:8466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_svgalib=yes else @@ -8479,12 +8483,12 @@ echo "$ac_t""$ac_cv_have_svgalib" 1>&6 for ac_func in vga_runinbackground_version mouse_getposition_6d do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8485: checking for $ac_func" >&5 +echo "configure:8489: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8546,17 +8550,17 @@ if test "$disable_fb" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8552: checking for $ac_hdr" >&5 +echo "configure:8556: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8595,7 +8599,7 @@ if test "$disable_directfb" != yes; then # Extract the first word of "directfb-config", so it can be a program name with args. set dummy directfb-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8601: checking for $ac_word" >&5 +echo "configure:8605: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DIRECTFB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8630,7 +8634,7 @@ fi if test "$DIRECTFB_CONFIG" != "no"; then echo $ac_n "checking for DirectFB >= 0.9.17""... $ac_c" 1>&6 -echo "configure:8636: checking for DirectFB >= 0.9.17" >&5 +echo "configure:8640: checking for DirectFB >= 0.9.17" >&5 directfb_version=`$DIRECTFB_CONFIG --version` if expr $directfb_version \>= 0.9.17 >/dev/null; then echo "$ac_t""yes" 1>&6 @@ -8650,7 +8654,7 @@ echo "configure:8636: checking for DirectFB >= 0.9.17" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8656: checking for $ac_word" >&5 +echo "configure:8660: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8694,19 +8698,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for directfb""... $ac_c" 1>&6 -echo "configure:8700: checking for directfb" >&5 +echo "configure:8704: checking for directfb" >&5 if $PKG_CONFIG --exists "directfb" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking DIRECTFB_CFLAGS""... $ac_c" 1>&6 -echo "configure:8707: checking DIRECTFB_CFLAGS" >&5 +echo "configure:8711: checking DIRECTFB_CFLAGS" >&5 DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb"` echo "$ac_t""$DIRECTFB_CFLAGS" 1>&6 echo $ac_n "checking DIRECTFB_LIBS""... $ac_c" 1>&6 -echo "configure:8712: checking DIRECTFB_LIBS" >&5 +echo "configure:8716: checking DIRECTFB_LIBS" >&5 DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb"` echo "$ac_t""$DIRECTFB_LIBS" 1>&6 else @@ -8745,19 +8749,19 @@ echo "configure:8712: checking DIRECTFB_LIBS" >&5 LIBS="$DIRECTFB_LIBS $LIBS" echo $ac_n "checking for DirectFBInit""... $ac_c" 1>&6 -echo "configure:8751: checking for DirectFBInit" >&5 +echo "configure:8755: checking for DirectFBInit" >&5 if eval "test \"`echo '$''{'ac_cv_have_directfbinit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { DirectFBInit(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:8763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_directfbinit=yes else @@ -8794,7 +8798,7 @@ if test "$disable_x" != yes; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:8800: checking for X" >&5 +echo "configure:8804: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -8856,12 +8860,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8934,14 +8938,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -9034,7 +9038,7 @@ fi if test "$static_link" != 0; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9032: checking for pthread_create in -lpthread" >&5 +echo "configure:9036: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9042,7 +9046,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9081,7 +9085,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:9079: checking for dlopen in -ldl" >&5 +echo "configure:9083: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9089,7 +9093,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9128,7 +9132,7 @@ else fi echo $ac_n "checking for XdmcpWrap in -lXdmcp""... $ac_c" 1>&6 -echo "configure:9126: checking for XdmcpWrap in -lXdmcp" >&5 +echo "configure:9130: checking for XdmcpWrap in -lXdmcp" >&5 ac_lib_var=`echo Xdmcp'_'XdmcpWrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9136,7 +9140,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXdmcp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9175,7 +9179,7 @@ else fi echo $ac_n "checking for XauGetBestAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:9173: checking for XauGetBestAuthByAddr in -lXau" >&5 +echo "configure:9177: checking for XauGetBestAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetBestAuthByAddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9183,7 +9187,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXau $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9222,7 +9226,7 @@ else fi echo $ac_n "checking for xcb_connect in -lxcb""... $ac_c" 1>&6 -echo "configure:9220: checking for xcb_connect in -lxcb" >&5 +echo "configure:9224: checking for xcb_connect in -lxcb" >&5 ac_lib_var=`echo xcb'_'xcb_connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9230,7 +9234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxcb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9269,7 +9273,7 @@ else fi echo $ac_n "checking for xcb_get_request_sent in -lxcb-xlib""... $ac_c" 1>&6 -echo "configure:9267: checking for xcb_get_request_sent in -lxcb-xlib" >&5 +echo "configure:9271: checking for xcb_get_request_sent in -lxcb-xlib" >&5 ac_lib_var=`echo xcb-xlib'_'xcb_get_request_sent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9277,7 +9281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxcb-xlib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9327,17 +9331,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9325: checking for $ac_hdr" >&5 +echo "configure:9329: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9367,12 +9371,12 @@ done for ac_func in XOpenDisplay XOpenIM XCloseIM XCreateIC XDestroyIC XwcLookupString Xutf8LookupString XSupportsLocale XmbTextListToTextProperty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9365: checking for $ac_func" >&5 +echo "configure:9369: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9421,19 +9425,19 @@ done echo $ac_n "checking for Xsetlocale""... $ac_c" 1>&6 -echo "configure:9419: checking for Xsetlocale" >&5 +echo "configure:9423: checking for Xsetlocale" >&5 if eval "test \"`echo '$''{'ac_cv_have_Xsetlocale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { setlocale(0, NULL); return 0; ; return 0; } EOF -if { (eval echo configure:9431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_Xsetlocale=yes else @@ -9470,12 +9474,12 @@ fi if test "$disable_pmshell" != yes && test "$ac_cv_header_sys_fmutex_h" = yes && test "$ac_cv_have_beginthread" = yes; then echo $ac_n "checking for pmshell""... $ac_c" 1>&6 -echo "configure:9468: checking for pmshell" >&5 +echo "configure:9472: checking for pmshell" >&5 if eval "test \"`echo '$''{'ac_cv_have_pmshell'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_pmshell=yes else @@ -9517,17 +9521,17 @@ if test "$disable_windows" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9515: checking for $ac_hdr" >&5 +echo "configure:9519: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9554,12 +9558,12 @@ fi done echo $ac_n "checking for ReleaseDC""... $ac_c" 1>&6 -echo "configure:9552: checking for ReleaseDC" >&5 +echo "configure:9556: checking for ReleaseDC" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows11'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9568,7 +9572,7 @@ int main() { ReleaseDC(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:9566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows11=yes else @@ -9585,12 +9589,12 @@ echo "$ac_t""$ac_cv_have_windows11" 1>&6 if test "$ac_cv_have_windows11" = no; then LIBS="-luser32 $LIBS" echo $ac_n "checking for ReleaseDC in -luser32""... $ac_c" 1>&6 -echo "configure:9583: checking for ReleaseDC in -luser32" >&5 +echo "configure:9587: checking for ReleaseDC in -luser32" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows12'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9599,7 +9603,7 @@ int main() { ReleaseDC(NULL, NULL) ; return 0; } EOF -if { (eval echo configure:9597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows12=yes else @@ -9615,12 +9619,12 @@ fi echo "$ac_t""$ac_cv_have_windows12" 1>&6 fi echo $ac_n "checking for GdiFlush""... $ac_c" 1>&6 -echo "configure:9613: checking for GdiFlush" >&5 +echo "configure:9617: checking for GdiFlush" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9629,7 +9633,7 @@ int main() { GdiFlush() ; return 0; } EOF -if { (eval echo configure:9627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows21=yes else @@ -9646,12 +9650,12 @@ echo "$ac_t""$ac_cv_have_windows21" 1>&6 if test "$ac_cv_have_windows21" = no; then LIBS="-lgdi32 $LIBS" echo $ac_n "checking for GdiFlush in -lgdi32""... $ac_c" 1>&6 -echo "configure:9644: checking for GdiFlush in -lgdi32" >&5 +echo "configure:9648: checking for GdiFlush in -lgdi32" >&5 if eval "test \"`echo '$''{'ac_cv_have_windows22'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9660,7 +9664,7 @@ int main() { GdiFlush() ; return 0; } EOF -if { (eval echo configure:9658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_windows22=yes else @@ -9694,17 +9698,17 @@ if test "$disable_atheos" != yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9692: checking for $ac_hdr" >&5 +echo "configure:9696: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9740,7 +9744,7 @@ done test "$ac_cv_header_util_locker_h" = yes && test "$ac_cv_header_util_application_h" = yes; then echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6 -echo "configure:9738: checking for main in -lstdc++" >&5 +echo "configure:9742: checking for main in -lstdc++" >&5 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9748,14 +9752,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lstdc++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9783,7 +9787,7 @@ else fi echo $ac_n "checking for main in -latheos""... $ac_c" 1>&6 -echo "configure:9781: checking for main in -latheos" >&5 +echo "configure:9785: checking for main in -latheos" >&5 ac_lib_var=`echo atheos'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9791,14 +9795,14 @@ else ac_save_LIBS="$LIBS" LIBS="-latheos $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9827,7 +9831,7 @@ fi if test "$ac_cv_lib_atheos_main" = no; then echo $ac_n "checking for main in -lsyllable""... $ac_c" 1>&6 -echo "configure:9825: checking for main in -lsyllable" >&5 +echo "configure:9829: checking for main in -lsyllable" >&5 ac_lib_var=`echo syllable'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9835,14 +9839,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsyllable $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9876,7 +9880,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9874: checking for $ac_word" >&5 +echo "configure:9878: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9908,7 +9912,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:9906: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:9910: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -9919,12 +9923,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 9917 "configure" +#line 9921 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:9922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -9950,12 +9954,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:9948: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:9952: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:9953: checking whether we are using GNU C++" >&5 +echo "configure:9957: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9964,7 +9968,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -9983,7 +9987,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:9981: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:9985: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10031,17 +10035,17 @@ if test "$disable_haiku" != yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10029: checking for $ac_hdr" >&5 +echo "configure:10033: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10076,7 +10080,7 @@ done test "$ac_cv_header_support_Locker_h" = yes && test "$ac_cv_header_app_Application_h" = yes; then echo $ac_n "checking for main in -lstdc++""... $ac_c" 1>&6 -echo "configure:10074: checking for main in -lstdc++" >&5 +echo "configure:10078: checking for main in -lstdc++" >&5 ac_lib_var=`echo stdc++'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10084,14 +10088,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lstdc++ $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10119,7 +10123,7 @@ else fi echo $ac_n "checking for main in -lbe""... $ac_c" 1>&6 -echo "configure:10117: checking for main in -lbe" >&5 +echo "configure:10121: checking for main in -lbe" >&5 ac_lib_var=`echo be'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10127,14 +10131,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbe $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10167,7 +10171,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10165: checking for $ac_word" >&5 +echo "configure:10169: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10199,7 +10203,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:10197: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:10201: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -10210,12 +10214,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 10208 "configure" +#line 10212 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -10241,12 +10245,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:10239: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:10243: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:10244: checking whether we are using GNU C++" >&5 +echo "configure:10248: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10255,7 +10259,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:10253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:10257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -10274,7 +10278,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:10272: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:10276: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10321,17 +10325,17 @@ if test "$disable_grx" != yes -a "$ac_cv_have_djgpp" = yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10319: checking for $ac_hdr" >&5 +echo "configure:10323: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10358,7 +10362,7 @@ fi done echo $ac_n "checking for GrSetMode in -lgrx20""... $ac_c" 1>&6 -echo "configure:10356: checking for GrSetMode in -lgrx20" >&5 +echo "configure:10360: checking for GrSetMode in -lgrx20" >&5 ac_lib_var=`echo grx20'_'GrSetMode | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10366,7 +10370,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgrx20 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10443,7 +10447,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10441: checking for $ac_word" >&5 +echo "configure:10445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10487,19 +10491,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for freetype2 fontconfig""... $ac_c" 1>&6 -echo "configure:10485: checking for freetype2 fontconfig" >&5 +echo "configure:10489: checking for freetype2 fontconfig" >&5 if $PKG_CONFIG --exists "freetype2 fontconfig" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBFREETYPE_CFLAGS""... $ac_c" 1>&6 -echo "configure:10492: checking LIBFREETYPE_CFLAGS" >&5 +echo "configure:10496: checking LIBFREETYPE_CFLAGS" >&5 LIBFREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 fontconfig"` echo "$ac_t""$LIBFREETYPE_CFLAGS" 1>&6 echo $ac_n "checking LIBFREETYPE_LIBS""... $ac_c" 1>&6 -echo "configure:10497: checking LIBFREETYPE_LIBS" >&5 +echo "configure:10501: checking LIBFREETYPE_LIBS" >&5 LIBFREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 fontconfig"` echo "$ac_t""$LIBFREETYPE_LIBS" 1>&6 else @@ -10538,17 +10542,17 @@ echo "configure:10497: checking LIBFREETYPE_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10536: checking for $ac_hdr" >&5 +echo "configure:10540: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10577,12 +10581,12 @@ done for ac_func in FcInit FT_Init_FreeType do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10575: checking for $ac_func" >&5 +echo "configure:10579: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10631,7 +10635,7 @@ done if test "$ac_cv_func_FT_Init_FreeType" != yes; then echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6 -echo "configure:10629: checking for FT_Init_FreeType in -lfreetype" >&5 +echo "configure:10633: checking for FT_Init_FreeType in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10639,7 +10643,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10680,7 +10684,7 @@ fi fi if test "$ac_cv_func_FcInit" != yes; then echo $ac_n "checking for FcInit in -lfontconfig""... $ac_c" 1>&6 -echo "configure:10678: checking for FcInit in -lfontconfig" >&5 +echo "configure:10682: checking for FcInit in -lfontconfig" >&5 ac_lib_var=`echo fontconfig'_'FcInit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10688,7 +10692,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfontconfig $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10733,12 +10737,12 @@ fi for ac_func in FcGetVersion FT_Library_Version do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10731: checking for $ac_func" >&5 +echo "configure:10735: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10809,7 +10813,7 @@ fi if test "$static_link" != 0; then echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:10807: checking for inflate in -lz" >&5 +echo "configure:10811: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10817,7 +10821,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10864,7 +10868,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10862: checking for $ac_word" >&5 +echo "configure:10866: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10908,19 +10912,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpng >= 1.0.0""... $ac_c" 1>&6 -echo "configure:10906: checking for libpng >= 1.0.0" >&5 +echo "configure:10910: checking for libpng >= 1.0.0" >&5 if $PKG_CONFIG --exists "libpng >= 1.0.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPNG_CFLAGS""... $ac_c" 1>&6 -echo "configure:10913: checking LIBPNG_CFLAGS" >&5 +echo "configure:10917: checking LIBPNG_CFLAGS" >&5 LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.0.0"` echo "$ac_t""$LIBPNG_CFLAGS" 1>&6 echo $ac_n "checking LIBPNG_LIBS""... $ac_c" 1>&6 -echo "configure:10918: checking LIBPNG_LIBS" >&5 +echo "configure:10922: checking LIBPNG_LIBS" >&5 LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.0.0"` echo "$ac_t""$LIBPNG_LIBS" 1>&6 else @@ -10960,7 +10964,7 @@ echo "configure:10918: checking LIBPNG_LIBS" >&5 # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10958: checking for $ac_word" >&5 +echo "configure:10962: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11004,19 +11008,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libpng12""... $ac_c" 1>&6 -echo "configure:11002: checking for libpng12" >&5 +echo "configure:11006: checking for libpng12" >&5 if $PKG_CONFIG --exists "libpng12" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBPNG12_CFLAGS""... $ac_c" 1>&6 -echo "configure:11009: checking LIBPNG12_CFLAGS" >&5 +echo "configure:11013: checking LIBPNG12_CFLAGS" >&5 LIBPNG12_CFLAGS=`$PKG_CONFIG --cflags "libpng12"` echo "$ac_t""$LIBPNG12_CFLAGS" 1>&6 echo $ac_n "checking LIBPNG12_LIBS""... $ac_c" 1>&6 -echo "configure:11014: checking LIBPNG12_LIBS" >&5 +echo "configure:11018: checking LIBPNG12_LIBS" >&5 LIBPNG12_LIBS=`$PKG_CONFIG --libs "libpng12"` echo "$ac_t""$LIBPNG12_LIBS" 1>&6 else @@ -11055,17 +11059,17 @@ echo "configure:11014: checking LIBPNG12_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11053: checking for $ac_hdr" >&5 +echo "configure:11057: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11094,12 +11098,12 @@ done for ac_func in png_create_info_struct do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11092: checking for $ac_func" >&5 +echo "configure:11096: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11148,7 +11152,7 @@ done if test "$ac_cv_func_png_create_info_struct" != yes; then echo $ac_n "checking for png_create_info_struct in -lpng""... $ac_c" 1>&6 -echo "configure:11146: checking for png_create_info_struct in -lpng" >&5 +echo "configure:11150: checking for png_create_info_struct in -lpng" >&5 ac_lib_var=`echo png'_'png_create_info_struct | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11156,7 +11160,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11202,12 +11206,12 @@ fi for ac_func in png_set_rgb_to_gray png_get_libpng_ver png_get_image_width png_get_image_height png_get_gAMA png_get_color_type png_get_bit_depth png_set_strip_alpha png_get_valid png_get_sRGB do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11200: checking for $ac_func" >&5 +echo "configure:11204: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11277,17 +11281,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11275: checking for $ac_hdr" >&5 +echo "configure:11279: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11314,7 +11318,7 @@ fi done echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:11312: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:11316: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11322,7 +11326,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11380,7 +11384,7 @@ fi if test "$disable_tiff" != yes; then if test "$static_link" != 0; then echo $ac_n "checking for jbg_enc_init in -ljbig""... $ac_c" 1>&6 -echo "configure:11378: checking for jbg_enc_init in -ljbig" >&5 +echo "configure:11382: checking for jbg_enc_init in -ljbig" >&5 ac_lib_var=`echo jbig'_'jbg_enc_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11388,7 +11392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljbig $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11431,17 +11435,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11429: checking for $ac_hdr" >&5 +echo "configure:11433: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11468,7 +11472,7 @@ fi done echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:11466: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:11470: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11476,7 +11480,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11550,7 +11554,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11548: checking for $ac_word" >&5 +echo "configure:11552: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11594,19 +11598,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for librsvg-2.0 >= 2.0.0 cairo""... $ac_c" 1>&6 -echo "configure:11592: checking for librsvg-2.0 >= 2.0.0 cairo" >&5 +echo "configure:11596: checking for librsvg-2.0 >= 2.0.0 cairo" >&5 if $PKG_CONFIG --exists "librsvg-2.0 >= 2.0.0 cairo" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBRSVG_CFLAGS""... $ac_c" 1>&6 -echo "configure:11599: checking LIBRSVG_CFLAGS" >&5 +echo "configure:11603: checking LIBRSVG_CFLAGS" >&5 LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.0.0 cairo"` echo "$ac_t""$LIBRSVG_CFLAGS" 1>&6 echo $ac_n "checking LIBRSVG_LIBS""... $ac_c" 1>&6 -echo "configure:11604: checking LIBRSVG_LIBS" >&5 +echo "configure:11608: checking LIBRSVG_LIBS" >&5 LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.0.0 cairo"` echo "$ac_t""$LIBRSVG_LIBS" 1>&6 else @@ -11645,17 +11649,17 @@ echo "configure:11604: checking LIBRSVG_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11643: checking for $ac_hdr" >&5 +echo "configure:11647: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11681,15 +11685,15 @@ else fi done - for ac_func in rsvg_handle_render_cairo rsvg_handle_read_stream_sync + for ac_func in rsvg_handle_render_cairo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11682: checking for $ac_func" >&5 +echo "configure:11686: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11738,7 +11742,7 @@ done if test "$ac_cv_func_rsvg_handle_render_cairo" != yes; then echo $ac_n "checking for rsvg_handle_render_cairo in -lrsvg-2""... $ac_c" 1>&6 -echo "configure:11736: checking for rsvg_handle_render_cairo in -lrsvg-2" >&5 +echo "configure:11740: checking for rsvg_handle_render_cairo in -lrsvg-2" >&5 ac_lib_var=`echo rsvg-2'_'rsvg_handle_render_cairo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11746,7 +11750,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrsvg-2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11786,6 +11790,61 @@ fi fi if test "$ac_cv_header_cairo_h" = yes -a "$ac_cv_header_librsvg_rsvg_h" = yes && test "$ac_cv_func_rsvg_handle_render_cairo" = yes -o "$ac_cv_lib_rsvg_2_rsvg_handle_render_cairo" = yes; then + for ac_func in rsvg_handle_read_stream_sync +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:11791: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:11819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + cat >> confdefs.h <<\EOF #define HAVE_SVG 1 EOF @@ -11798,6 +11857,334 @@ EOF fi fi + # Check whether --with-libwebp or --without-libwebp was given. +if test "${with_libwebp+set}" = set; then + withval="$with_libwebp" + if test "$withval" = no; then disable_webp=yes; else disable_webp=no; fi +fi + + cf_have_webp=no + if test "$disable_webp" != yes; then + CPPFLAGS_X="$CPPFLAGS" + LIBS_X="$LIBS" + # Check whether --enable-webp-pkgconfig or --disable-webp-pkgconfig was given. +if test "${enable_webp_pkgconfig+set}" = set; then + enableval="$enable_webp_pkgconfig" + cf_libwebp_pkgconfig="$enableval" +else + cf_libwebp_pkgconfig=yes +fi + + if test "$cf_libwebp_pkgconfig" != no; then + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11881: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for libwebp""... $ac_c" 1>&6 +echo "configure:11925: checking for libwebp" >&5 + + if $PKG_CONFIG --exists "libwebp" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBWEBP_CFLAGS""... $ac_c" 1>&6 +echo "configure:11932: checking LIBWEBP_CFLAGS" >&5 + LIBWEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp"` + echo "$ac_t""$LIBWEBP_CFLAGS" 1>&6 + + echo $ac_n "checking LIBWEBP_LIBS""... $ac_c" 1>&6 +echo "configure:11937: checking LIBWEBP_LIBS" >&5 + LIBWEBP_LIBS=`$PKG_CONFIG --libs "libwebp"` + echo "$ac_t""$LIBWEBP_LIBS" 1>&6 + else + LIBWEBP_CFLAGS="" + LIBWEBP_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBWEBP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libwebp"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + pkgconfig_libwebp=yes + else + pkgconfig_libwebp=no + fi + + if test "$PKG_CONFIG" != no -a "$pkgconfig_libwebp" = no; then + echo "$ac_t""no" 1>&6 + fi + if test "$pkgconfig_libwebp" = "yes"; then + CPPFLAGS="$CPPFLAGS $LIBWEBP_CFLAGS" + LIBS="$LIBWEBP_LIBS $LIBS" + fi + fi + + for ac_hdr in webp/decode.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:11976: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + for ac_func in WebPDecodeRGBA +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:12015: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:12043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + if test "$ac_cv_func_WebPDecodeRGBA" != yes; then + echo $ac_n "checking for WebPDecodeRGBA in -lwebp""... $ac_c" 1>&6 +echo "configure:12069: checking for WebPDecodeRGBA in -lwebp" >&5 +ac_lib_var=`echo webp'_'WebPDecodeRGBA | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lwebp $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo webp | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi + if test "$ac_cv_header_webp_decode_h" = yes && test "$ac_cv_func_WebPDecodeRGBA" = yes -o "$ac_cv_lib_webp_WebPDecodeRGBA" = yes; then + for ac_func in WebPFree +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:12120: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:12148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + cat >> confdefs.h <<\EOF +#define HAVE_WEBP 1 +EOF + + cf_have_webp=yes + image_formats="$image_formats WEBP" + else + CPPFLAGS="$CPPFLAGS_X" + LIBS="$LIBS_X" + fi + fi if test -z "$drivers" && test "$cf_use_graphics" != no; then { echo "configure: error: No graphics drivers found." 1>&2; exit 1; } @@ -11839,12 +12226,12 @@ test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" for ac_func in pthread_sigmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11837: checking for $ac_func" >&5 +echo "configure:12224: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11894,7 +12281,7 @@ done if test "$ac_cv_func_pthread_sigmask" = yes; then echo $ac_n "checking for pthread_sigmask in -lpthread""... $ac_c" 1>&6 -echo "configure:11892: checking for pthread_sigmask in -lpthread" >&5 +echo "configure:12279: checking for pthread_sigmask in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_sigmask | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11902,7 +12289,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12107,6 +12494,8 @@ s%@LIBPNG12_CFLAGS@%$LIBPNG12_CFLAGS%g s%@LIBPNG12_LIBS@%$LIBPNG12_LIBS%g s%@LIBRSVG_CFLAGS@%$LIBRSVG_CFLAGS%g s%@LIBRSVG_LIBS@%$LIBRSVG_LIBS%g +s%@LIBWEBP_CFLAGS@%$LIBWEBP_CFLAGS%g +s%@LIBWEBP_LIBS@%$LIBWEBP_LIBS%g s%@JAVASCRIPT_TRUE@%$JAVASCRIPT_TRUE%g s%@JAVASCRIPT_FALSE@%$JAVASCRIPT_FALSE%g s%@ATHEOS_GR_TRUE@%$ATHEOS_GR_TRUE%g diff --git a/configure.in b/configure.in index 5832504..4b3338e 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AC_INIT(main.c) -AM_INIT_AUTOMAKE(links, 2.25) +AM_INIT_AUTOMAKE(links, 2.26) ACLOCAL="./missing aclocal" AUTOCONF="./missing autoconf" @@ -910,7 +910,7 @@ if test -z "$disable_ssl"; then if test "$cf_result" = nss; then AC_DEFINE(HAVE_NSS) fi - AC_HAVE_FUNCS(ASN1_STRING_get0_data ASN1_STRING_to_UTF8 OPENSSL_cleanup OPENSSL_init_ssl RAND_add RAND_egd RAND_file_name RAND_load_file RAND_write_file SSL_SESSION_is_resumable SSL_get0_verified_chain SSL_get1_peer_certificate SSL_get1_session SSL_load_error_strings SSL_set_security_level X509_check_host X509_check_ip) + AC_HAVE_FUNCS(ASN1_STRING_get0_data ASN1_STRING_to_UTF8 OPENSSL_cleanup OPENSSL_init_ssl RAND_add RAND_egd RAND_file_name RAND_load_file RAND_write_file SSL_SESSION_is_resumable SSL_get0_verified_chain SSL_get1_peer_certificate SSL_get1_session SSL_load_error_strings SSL_set_security_level X509_VERIFY_PARAM_set_flags X509_check_host X509_check_ip) AC_CACHE_CHECK([for CRYPTO_set_mem_functions without file/line], ac_cv_have_crypto_set_mem_functions_1, AC_TRY_LINK([#include static int csmf(void *(*m)(size_t), void *(*r)(void *, size_t), void (*f)(void *)) { return 0; } @@ -1441,11 +1441,12 @@ fi fi AC_CHECK_HEADERS(cairo.h librsvg/rsvg.h librsvg/rsvg-cairo.h librsvg/librsvg-features.h) - AC_HAVE_FUNCS(rsvg_handle_render_cairo rsvg_handle_read_stream_sync) + AC_HAVE_FUNCS(rsvg_handle_render_cairo) if test "$ac_cv_func_rsvg_handle_render_cairo" != yes; then AC_CHECK_LIB(rsvg-2, rsvg_handle_render_cairo) fi if test "$ac_cv_header_cairo_h" = yes -a "$ac_cv_header_librsvg_rsvg_h" = yes && test "$ac_cv_func_rsvg_handle_render_cairo" = yes -o "$ac_cv_lib_rsvg_2_rsvg_handle_render_cairo" = yes; then + AC_HAVE_FUNCS(rsvg_handle_read_stream_sync) AC_DEFINE(HAVE_SVG) cf_have_svg=yes image_formats="$image_formats SVG" @@ -1455,6 +1456,38 @@ fi fi fi + AC_ARG_WITH(libwebp, [ --without-libwebp compile without WEBP support],[if test "$withval" = no; then disable_webp=yes; else disable_webp=no; fi]) + cf_have_webp=no + if test "$disable_webp" != yes; then + CPPFLAGS_X="$CPPFLAGS" + LIBS_X="$LIBS" + AC_ARG_ENABLE(webp-pkgconfig, [ --disable-webp-pkgconfig don't use pkgconfig when searching for librwebp], cf_libwebp_pkgconfig="$enableval", cf_libwebp_pkgconfig=yes) + if test "$cf_libwebp_pkgconfig" != no; then + PKG_CHECK_MODULES(LIBWEBP, libwebp, pkgconfig_libwebp=yes, pkgconfig_libwebp=no) + if test "$PKG_CONFIG" != no -a "$pkgconfig_libwebp" = no; then + AC_MSG_RESULT(no) + fi + if test "$pkgconfig_libwebp" = "yes"; then + CPPFLAGS="$CPPFLAGS $LIBWEBP_CFLAGS" + LIBS="$LIBWEBP_LIBS $LIBS" + fi + fi + + AC_CHECK_HEADERS(webp/decode.h) + AC_HAVE_FUNCS(WebPDecodeRGBA) + if test "$ac_cv_func_WebPDecodeRGBA" != yes; then + AC_CHECK_LIB(webp, WebPDecodeRGBA) + fi + if test "$ac_cv_header_webp_decode_h" = yes && test "$ac_cv_func_WebPDecodeRGBA" = yes -o "$ac_cv_lib_webp_WebPDecodeRGBA" = yes; then + AC_HAVE_FUNCS(WebPFree) + AC_DEFINE(HAVE_WEBP) + cf_have_webp=yes + image_formats="$image_formats WEBP" + else + CPPFLAGS="$CPPFLAGS_X" + LIBS="$LIBS_X" + fi + fi if test -z "$drivers" && test "$cf_use_graphics" != no; then AC_MSG_ERROR([No graphics drivers found.]) diff --git a/connect.c b/connect.c index 8a6ad34..f124832 100644 --- a/connect.c +++ b/connect.c @@ -110,9 +110,7 @@ int socket_and_bind(int pf, unsigned char *address) struct sockaddr_in sa; unsigned char addr[4]; if (numeric_ip_address(address, addr) == -1) { - EINTRLOOP(rs, close(s)); - errno = EINVAL; - return -1; + goto bind_to_iface; } memset(&sa, 0, sizeof sa); sa.sin_family = AF_INET; @@ -133,9 +131,7 @@ int socket_and_bind(int pf, unsigned char *address) unsigned char addr[16]; unsigned scope; if (numeric_ipv6_address(address, addr, &scope) == -1) { - EINTRLOOP(rs, close(s)); - errno = EINVAL; - return -1; + goto bind_to_iface; } memset(&sa, 0, sizeof sa); sa.sin6_family = AF_INET6; @@ -162,6 +158,16 @@ int socket_and_bind(int pf, unsigned char *address) } } return s; +bind_to_iface: + errno = EINVAL; +#ifdef SO_BINDTODEVICE + EINTRLOOP(rs, setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, address, (socklen_t)(strlen(cast_const_char address) + 1))); + if (!rs) { + return s; + } +#endif + EINTRLOOP(rs, close(s)); + return -1; } void close_socket(int *s) @@ -187,7 +193,6 @@ struct conn_info { void make_connection(struct connection *c, int port, int *sock, void (*func)(struct connection *)) { int socks_port = -1; - int as; unsigned char *host; size_t sl; struct conn_info *b; @@ -239,14 +244,17 @@ void make_connection(struct connection *c, int port, int *sock, void (*func)(str b->l.addr_index = c->last_lookup_state.addr_index; b->l.dont_try_more_servers = 1; dns_found(c, 0); - as = 0; - } else if (c->no_cache >= NC_RELOAD) { - as = find_host_no_cache(host, &b->l.addr, &c->dnsquery, dns_found, c); } else { - as = find_host(host, &b->l.addr, &c->dnsquery, dns_found, c); + int q = -1; + if (c->no_cache < NC_RELOAD) { + q = find_host_in_cache(host, &b->l.addr, &c->dnsquery, dns_found, c); + } + if (q) { + setcstate(c, S_DNS); + find_host_no_cache(host, c->doh, &b->l.addr, &c->dnsquery, dns_found, c); + } } mem_free(host); - if (as) setcstate(c, S_DNS); } int is_ipv6(int h) @@ -610,16 +618,13 @@ void retry_connect(struct connection *c, int err, int ssl_downgrade) return; } b->l.addr_index++; -#if MAX_ADDRESSES > 1 if (b->l.addr_index < b->l.addr.n && !b->l.dont_try_more_servers) { if (b->l.addr_index == 1) rotate_addresses(&b->l.addr); log_string(cast_uchar "\nNEXT ADDRESS\n"); close_socket(b->sock); try_connect(c); - } else -#endif - { + } else { dns_clear_host(b->host); setcstate(c, b->first_error); retry_connection(c); @@ -702,11 +707,9 @@ static void try_connect(struct connection *c) } set_handlers(s, NULL, connected, c); setcstate(c, !b->l.addr_index ? S_CONN : S_CONN_ANOTHER); -#if MAX_ADDRESSES > 1 if (b->l.addr.n > 1 && (is_connection_restartable(c) || max_tries == 1)) { set_connection_timeout(c); } -#endif } else { connected(c); } @@ -846,7 +849,6 @@ skip_numeric_address: static void update_dns_priority(struct connection *c) { -#if MAX_ADDRESSES > 1 struct conn_info *b = c->newconn; if (!b->l.dont_try_more_servers && b->host[0]) { if (b->l.addr_index) { @@ -857,7 +859,6 @@ static void update_dns_priority(struct connection *c) } b->l.dont_try_more_servers = 1; } -#endif } static void connected_callback(struct connection *c) diff --git a/default.c b/default.c index 07f6b61..7f241ac 100644 --- a/default.c +++ b/default.c @@ -1426,26 +1426,6 @@ static void dp_wr(struct option *o, unsigned char **s, int *l) } } -static unsigned char *ip_rd(struct option *o, unsigned char *c) -{ - unsigned char *e; - e = str_rd(o, c); - if (e) return e; - if (*(unsigned char *)o->ptr && numeric_ip_address(o->ptr, NULL) == -1) return cast_uchar "Invalid IP address"; - return NULL; -} - -static unsigned char *ipv6_rd(struct option *o, unsigned char *c) -{ - unsigned char *e; - e = str_rd(o, c); - if (e) return e; -#ifdef SUPPORT_IPV6 - if (*(unsigned char *)o->ptr && numeric_ipv6_address(o->ptr, NULL, NULL) == -1) return cast_uchar "Invalid IPv6 address"; -#endif - return NULL; -} - static unsigned char *gen_cmd(struct option *o, unsigned char ***argv, int *argc) { unsigned char *e; @@ -1665,10 +1645,10 @@ fprintf(stdout, "%s%s%s%s%s%s\n", " Timeout for connection when trying multiple addresses or keepalive connection.\n" " (default: 3)\n" "\n" -" -bind-address \n" +" -bind-address \n" " Use a specific local IP address.\n" "\n" -" -bind-address-ipv6 \n" +" -bind-address-ipv6 \n" " Use a specific local IPv6 address.\n" "\n" " -no-libevent\n" @@ -1677,9 +1657,6 @@ fprintf(stdout, "%s%s%s%s%s%s\n", " -no-openmp\n" " Don't use OpenMP.\n" "\n" -" -async-dns <0>/<1>\n" -" Asynchronous DNS resolver on(1)/off(0).\n" -"\n" " -download-utime <0>/<1>\n" " Set time of downloaded files to last modification time reported by server.\n" "\n" @@ -1767,6 +1744,13 @@ fprintf(stdout, "%s%s%s%s%s%s\n", "\n" " -ssl.client-cert-password \n" " Password for the user private key.\n" +"\n" +" -async-dns <0>/<1>\n" +" Asynchronous DNS resolver on(1)/off(0).\n" +"\n" +" -dns-over-https \n" +" DNS over HTTPS url.\n" +" (default: blank)\n" "\n"),( " -http-bugs.http10 <0>/<1>\n" " (default 0)\n" @@ -2139,7 +2123,6 @@ int unrestartable_receive_timeout = 600; int timeout_multiple_addresses = 3; unsigned char bind_ip_address[16] = ""; unsigned char bind_ipv6_address[INET6_ADDRSTRLEN] = ""; -int async_lookup = 1; int download_utime = 0; int max_format_cache_entries = 5; @@ -2157,6 +2140,8 @@ struct ssl_options ssl_options = { SSL_WARN_ON_INVALID_CERTIFICATE, 0, #endif "", "", "" }; +int async_lookup = 1; +unsigned char dns_over_https[MAX_STR_LEN] = ""; struct http_options http_options = { 0, 1, 0, 0, 0, { 0, 0, REFERER_REAL_SAME_SERVER, "", "", "" } }; struct ftp_options ftp_options = { "somebody@host.domain", 1, 0, 1 }; struct smb_options smb_options = { 0 }; @@ -2269,11 +2254,10 @@ static struct option links_options[] = { {1, gen_cmd, num_rd, num_wr, 1, 9999, &receive_timeout, "receive_timeout", "receive-timeout"}, {1, gen_cmd, num_rd, num_wr, 1, 9999, &unrestartable_receive_timeout, "unrestartable_receive_timeout", "unrestartable-receive-timeout"}, {1, gen_cmd, num_rd, num_wr, 1, 999, &timeout_multiple_addresses, "timeout_when_trying_multiple_addresses", "timeout-when-trying-multiple-addresses"}, - {1, gen_cmd, ip_rd, str_wr, 0, 16, bind_ip_address, "bind_address", "bind-address"}, - {1, gen_cmd, ipv6_rd, str_wr, 0, INET6_ADDRSTRLEN, bind_ipv6_address, "bind_address_ipv6", "bind-address-ipv6"}, + {1, gen_cmd, str_rd, str_wr, 0, 16, bind_ip_address, "bind_address", "bind-address"}, + {1, gen_cmd, str_rd, str_wr, 0, INET6_ADDRSTRLEN, bind_ipv6_address, "bind_address_ipv6", "bind-address-ipv6"}, {1, set_cmd, NULL, NULL, 0, 0, &disable_libevent, NULL, "no-libevent"}, {1, set_cmd, NULL, NULL, 0, 0, &disable_openmp, NULL, "no-openmp"}, - {1, gen_cmd, num_rd, num_wr, 0, 1, &async_lookup, "async_dns", "async-dns"}, {1, gen_cmd, num_rd, num_wr, 0, 1, &download_utime, "download_utime", "download-utime"}, {1, gen_cmd, num_rd, num_wr, 0, 999, &max_format_cache_entries, "format_cache_size", "format-cache-size"}, {1, gen_cmd, num_rd, num_wr, 0, MAXINT, &memory_cache_size, "memory_cache_size", "memory-cache-size"}, @@ -2296,6 +2280,8 @@ static struct option links_options[] = { {1, gen_cmd, str_rd, NULL, 0, MAX_STR_LEN, &ssl_options.client_cert_password, NULL, "ssl.client-cert-password"}, {1, gen_cmd, str_rd, NULL, 0, MAX_STR_LEN, &ssl_options.client_cert_key, "client_cert_key", "http.client_cert_key"}, /* backward compatibility with Debian patches */ {1, gen_cmd, str_rd, NULL, 0, MAX_STR_LEN, &ssl_options.client_cert_crt, "client_cert_crt", "http.client_cert_crt"}, /* backward compatibility with Debian patches */ + {1, gen_cmd, num_rd, num_wr, 0, 1, &async_lookup, "async_dns", "async-dns"}, + {1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, dns_over_https, "dns_over_https", "dns-over-https"}, {1, gen_cmd, num_rd, num_wr, 0, 1, &http_options.http10, "http_bugs.http10", "http-bugs.http10"}, {1, gen_cmd, num_rd, num_wr, 0, 1, &http_options.allow_blacklist, "http_bugs.allow_blacklist", "http-bugs.allow-blacklist"}, {1, gen_cmd, NULL, NULL, 0, 1, NULL, "http_bugs.bug_302_redirect", NULL}, @@ -2366,6 +2352,7 @@ static struct option links_options[] = { {1, NULL, prog_rd, prog_wr, 0, 0, &tn3270_prog, "tn3270", NULL}, {1, NULL, prog_rd, prog_wr, 0, 0, &mms_prog, "mms", NULL}, {1, NULL, prog_rd, prog_wr, 0, 0, &magnet_prog, "magnet", NULL}, + {1, NULL, prog_rd, prog_wr, 0, 0, &gopher_prog, "gopher", NULL}, {1, NULL, block_rd, block_wr, 0, 0, NULL, "imageblock", NULL}, {1, NULL, dp_rd, dp_wr, 0, 0, NULL, "video_driver", NULL}, {0, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL}, diff --git a/descrip.mms b/descrip.mms index 7314605..97f12d7 100644 --- a/descrip.mms +++ b/descrip.mms @@ -76,7 +76,7 @@ CFLAGS=/DEFINE=(HAVE_CONFIG_VMS_H$(DEFS_OPTIMIZE)$(DEFS_SSL)$(DEFS_GFX)) /INCLUD LINKFLAGS=$(LIBS_SSL)$(LIBS_GFX)/MAP/FULL/THREADS_ENABLE -OBJS=AF_UNIX.OBJ,AUTH.OBJ,BEOS.OBJ,BFU.OBJ,BLOCK.OBJ,BOOKMARK.OBJ,CACHE.OBJ,CHARSETS.OBJ,COMPRESS.OBJ,CONNECT.OBJ,COOKIES.OBJ,DATA.OBJ,DEFAULT.OBJ,DIP.OBJ,DIRECTFB.OBJ,DITHER.OBJ,DNS.OBJ,DOS.OBJ,DRIVERS.OBJ,ERROR.OBJ,FILE.OBJ,FINGER.OBJ,FN_IMPL.OBJ,FONT_INC.OBJ,FRAMEBUF.OBJ,FTP.OBJ,GIF.OBJ,HPUX.OBJ,HTML.OBJ,HTML_GR.OBJ,HTML_R.OBJ,HTML_TBL.OBJ,HTTP.OBJ,HTTPS.OBJ,IMG.OBJ,IMGCACHE.OBJ,JPEG.OBJ,JSINT.OBJ,KBD.OBJ,LANGUAGE.OBJ,LISTEDIT.OBJ,LRU.OBJ,MAILTO.OBJ,MAIN.OBJ,MEMORY.OBJ,MENU.OBJ,OBJREQ.OBJ,OS_DEP.OBJ,PMSHELL.OBJ,PNG.OBJ,SCHED.OBJ,SELECT.OBJ,SESSION.OBJ,SMB.OBJ,STRING.OBJ,SUFFIX.OBJ,SVG.OBJ,SVGALIB.OBJ,TERMINAL.OBJ,TIFF.OBJ,TYPES.OBJ,URL.OBJ,VIEW.OBJ,VIEW_GR.OBJ,VMS.OBJ,X.OBJ,XBM.OBJ +OBJS=AF_UNIX.OBJ,AUTH.OBJ,BEOS.OBJ,BFU.OBJ,BLOCK.OBJ,BOOKMARK.OBJ,CACHE.OBJ,CHARSETS.OBJ,COMPRESS.OBJ,CONNECT.OBJ,COOKIES.OBJ,DATA.OBJ,DEFAULT.OBJ,DIP.OBJ,DIRECTFB.OBJ,DITHER.OBJ,DNS.OBJ,DOH.OBJ,DOS.OBJ,DRIVERS.OBJ,ERROR.OBJ,FILE.OBJ,FINGER.OBJ,FN_IMPL.OBJ,FONT_INC.OBJ,FRAMEBUF.OBJ,FTP.OBJ,GIF.OBJ,HPUX.OBJ,HTML.OBJ,HTML_GR.OBJ,HTML_R.OBJ,HTML_TBL.OBJ,HTTP.OBJ,HTTPS.OBJ,IMG.OBJ,IMGCACHE.OBJ,JPEG.OBJ,JSINT.OBJ,KBD.OBJ,LANGUAGE.OBJ,LISTEDIT.OBJ,LRU.OBJ,MAILTO.OBJ,MAIN.OBJ,MEMORY.OBJ,MENU.OBJ,OBJREQ.OBJ,OS_DEP.OBJ,PMSHELL.OBJ,PNG.OBJ,SCHED.OBJ,SELECT.OBJ,SESSION.OBJ,SMB.OBJ,STRING.OBJ,SUFFIX.OBJ,SVG.OBJ,SVGALIB.OBJ,TERMINAL.OBJ,TIFF.OBJ,TYPES.OBJ,URL.OBJ,VIEW.OBJ,VIEW_GR.OBJ,VMS.OBJ,WEBP.OBJ,X.OBJ,XBM.OBJ LINKS.EXE : $(OBJS) $(LINK) /EXECUTABLE=LINKS.EXE $(OBJS)$(LINKFLAGS) diff --git a/dip.c b/dip.c index 20b2a62..b8acd6a 100644 --- a/dip.c +++ b/dip.c @@ -160,8 +160,10 @@ static void add_row_gray(unsigned *my_restrict row_buf, unsigned char *my_restri ATTR_NOINLINE #endif static void add_col_color(scale_t *my_restrict col_buf, -#if defined(__GNUC__) && __GNUC__ == 3 +#ifdef __GNUC__ +#if __GNUC__ == 3 volatile +#endif #endif unsigned short *my_restrict ptr, size_t line_skip, size_t n, ulonglong weight) @@ -194,8 +196,10 @@ static void add_col_color(scale_t *my_restrict col_buf, /* n is in pixels. pixel is 3 unsigned shorts in series */ /* We assume unsigned short holds at least 16 bits. */ static void add_row_color(scale_t *my_restrict row_buf, -#if defined(__GNUC__) && __GNUC__ == 3 +#ifdef __GNUC__ +#if __GNUC__ == 3 volatile +#endif #endif unsigned short *my_restrict ptr, size_t n, ulonglong weight) diff --git a/dither.c b/dither.c index b57b2ec..e7da305 100644 --- a/dither.c +++ b/dither.c @@ -54,9 +54,11 @@ static int *red_table = DUMMY, *green_table = DUMMY, *blue_table = DUMMY; static int table_16 = 1; static unsigned short * -#if defined(__GNUC__) && __GNUC__ == 3 +#ifdef __GNUC__ +#if __GNUC__ == 3 volatile #endif +#endif real_colors_table = NULL; /* If we want to represent some 16-bit from-screen-light, it would require certain display input diff --git a/dns.c b/dns.c index 4d7484e..bb8ac77 100644 --- a/dns.c +++ b/dns.c @@ -63,6 +63,7 @@ static void my_freeaddrinfo(struct addrinfo *res) struct dnsentry { list_entry_1st uttime absolute_time; + uttime timeout; struct lookup_result addr; list_entry_last unsigned char name[1]; @@ -72,23 +73,9 @@ struct dnsentry { struct dnsquery *dns_queue = NULL; #endif -struct dnsquery { -#ifndef THREAD_SAFE_LOOKUP - struct dnsquery *next_in_queue; -#endif - void (*fn)(void *, int); - void *data; - int h; - struct dnsquery **s; - struct lookup_result *addr; - int addr_preference; - unsigned char name[1]; -}; - static int dns_cache_addr_preference = -1; static struct list_head dns_cache = {&dns_cache, &dns_cache}; -static void end_dns_lookup(struct dnsquery *q, int a); static int shrink_dns_cache(int u); static int get_addr_byte(unsigned char **ptr, unsigned char *res, unsigned char stp) @@ -237,22 +224,18 @@ skip_addr: #endif -#if MAX_ADDRESSES > 1 static int memcmp_host_address(struct host_address *a, struct host_address *b) { if (a->af != b->af || a->scope_id != b->scope_id) return 1; return memcmp(a->addr, b->addr, sizeof a->addr); } -#endif -static void add_address(struct lookup_result *host, int af, unsigned char *address, unsigned scope_id, int preference) +void add_address(struct lookup_result *host, int af, unsigned char *address, unsigned scope_id, int preference) { struct host_address neww; struct host_address *e, *t; -#if MAX_ADDRESSES > 1 struct host_address *n; -#endif if (af != AF_INET && preference == ADDR_PREFERENCE_IPV4_ONLY) return; #ifdef SUPPORT_IPV6 @@ -267,7 +250,6 @@ static void add_address(struct lookup_result *host, int af, unsigned char *addre neww.scope_id = scope_id; e = &host->a[host->n]; t = e; -#if MAX_ADDRESSES > 1 for (n = host->a; n != e; n++) { if (!memcmp_host_address(n, &neww)) return; @@ -283,7 +265,6 @@ static void add_address(struct lookup_result *host, int af, unsigned char *addre #endif } memmove(t + 1, t, (e - t) * sizeof(struct host_address)); -#endif memcpy(t, &neww, sizeof(struct host_address)); host->n++; } @@ -329,7 +310,6 @@ static int use_getaddrinfo(unsigned char *name, struct addrinfo *hints, int pref void rotate_addresses(struct lookup_result *host) { -#if MAX_ADDRESSES > 1 int first_type, first_different, i; if (host->n <= 2) @@ -352,7 +332,6 @@ do_swap: memmove(&host->a[2], &host->a[1], (first_different - 1) * sizeof(struct host_address)); memcpy(&host->a[1], &ha, sizeof(struct host_address)); } -#endif } void do_real_lookup(unsigned char *name, int preference, struct lookup_result *host) @@ -471,11 +450,11 @@ static void end_real_lookup(void *q_) end: set_handlers(q->h, NULL, NULL, NULL); EINTRLOOP(rs, close(q->h)); - end_dns_lookup(q, r); + end_dns_lookup(q, r, -1); } #endif -static int do_lookup(struct dnsquery *q, int force_async) +static void do_lookup(struct dnsquery *q, int force_async) { /*debug("starting lookup for %s", q->name);*/ #ifndef NO_ASYNC_LOOKUP @@ -485,34 +464,30 @@ static int do_lookup(struct dnsquery *q, int force_async) sync_lookup: #endif do_real_lookup(q->name, q->addr_preference, q->addr); - end_dns_lookup(q, !q->addr->n); - return 0; + end_dns_lookup(q, !q->addr->n, -1); #ifndef NO_ASYNC_LOOKUP } else { q->h = start_thread(lookup_fn, q, (int)((unsigned char *)strchr(cast_const_char q->name, 0) + 1 - (unsigned char *)q), 1); if (q->h == -1) goto sync_lookup; set_handlers(q->h, end_real_lookup, NULL, q); - return 1; } #endif } -static int do_queued_lookup(struct dnsquery *q) +static void do_queued_lookup(struct dnsquery *q) { #ifndef THREAD_SAFE_LOOKUP - q->next_in_queue = NULL; if (!dns_queue) { dns_queue = q; /*debug("direct lookup");*/ #endif - return do_lookup(q, 0); + do_lookup(q, 0); #ifndef THREAD_SAFE_LOOKUP } else { /*debug("queuing lookup for %s", q->name);*/ if (dns_queue->next_in_queue) internal_error("DNS queue corrupted"); dns_queue->next_in_queue = q; dns_queue = q; - return 1; } #endif } @@ -546,13 +521,15 @@ static void free_dns_entry(struct dnsentry *dnsentry) mem_free(dnsentry); } -static void end_dns_lookup(struct dnsquery *q, int a) +void end_dns_lookup(struct dnsquery *q, int a, uttime timeout) { struct dnsentry *dnsentry; size_t sl; void (*fn)(void *, int); void *data; - /*debug("end lookup %s", q->name);*/ + /*debug("end lookup %s: %d, %lu", q->name, a, (unsigned long)timeout);*/ + if (timeout > DNS_TIMEOUT) + timeout = DNS_TIMEOUT; #ifndef THREAD_SAFE_LOOKUP if (q->next_in_queue) { /*debug("processing next in queue: %s", q->next_in_queue->name);*/ @@ -580,6 +557,7 @@ static void end_dns_lookup(struct dnsquery *q, int a) strcpy(cast_char dnsentry->name, cast_const_char q->name); memcpy(&dnsentry->addr, q->addr, sizeof(struct lookup_result)); dnsentry->absolute_time = get_absolute_time(); + dnsentry->timeout = timeout; add_to_list(dns_cache, dnsentry); e: if (q->s) *q->s = NULL; @@ -589,7 +567,7 @@ static void end_dns_lookup(struct dnsquery *q, int a) fn(data, a); } -int find_host_no_cache(unsigned char *name, struct lookup_result *addr, void **qp, void (*fn)(void *, int), void *data) +void find_host_no_cache(unsigned char *name, int no_doh, struct lookup_result *addr, void **qp, void (*fn)(void *, int), void *data) { struct dnsquery *q; retry: @@ -598,30 +576,45 @@ int find_host_no_cache(unsigned char *name, struct lookup_result *addr, void **q if (out_of_memory(0, NULL, 0)) goto retry; fn(data, 1); - return 0; } +#ifndef THREAD_SAFE_LOOKUP + q->next_in_queue = NULL; +#endif q->fn = fn; q->data = data; - q->s = (struct dnsquery **)qp; + q->s = qp; + q->doh = NULL; q->addr = addr; q->addr_preference = ipv6_options.addr_preference; strcpy(cast_char q->name, cast_const_char name); if (qp) *qp = q; - return do_queued_lookup(q); + if (is_noproxy_host(name)) + no_doh = 1; + if (!numeric_ip_address(name, NULL)) + no_doh = 1; +#ifdef SUPPORT_IPV6 + if (!numeric_ipv6_address(name, NULL, NULL)) + no_doh = 1; +#endif + if (!no_doh && *dns_over_https) { + do_doh_lookup(q); + } else { + do_queued_lookup(q); + } } -int find_host(unsigned char *name, struct lookup_result *addr, void **qp, void (*fn)(void *, int), void *data) +int find_host_in_cache(unsigned char *name, struct lookup_result *addr, void **qp, void (*fn)(void *, int), void *data) { struct dnsentry *dnsentry; if (qp) *qp = NULL; if (!find_in_dns_cache(name, &dnsentry)) { - if (get_absolute_time() - dnsentry->absolute_time > DNS_TIMEOUT) goto timeout; + if (get_absolute_time() - dnsentry->absolute_time >= dnsentry->timeout) goto timeout; memcpy(addr, &dnsentry->addr, sizeof(struct lookup_result)); fn(data, 0); return 0; } timeout: - return find_host_no_cache(name, addr, qp, fn, data); + return -1; } void kill_dns_request(void **qp) @@ -649,11 +642,11 @@ void dns_prefetch(unsigned char *name) addr = (struct lookup_result *)malloc(sizeof(struct lookup_result)); if (!addr) return; - find_host(name, addr, NULL, dns_prefetch_end, addr); + if (find_host_in_cache(name, addr, NULL, dns_prefetch_end, addr)) + find_host_no_cache(name, 0, addr, NULL, dns_prefetch_end, addr); #endif } -#if MAX_ADDRESSES > 1 void dns_set_priority(unsigned char *name, struct host_address *address, int prefer) { int i; @@ -672,7 +665,6 @@ void dns_set_priority(unsigned char *name, struct host_address *address, int pre memcpy(&dnsentry->addr.a[dnsentry->addr.n - 1], address, sizeof(struct host_address)); } } -#endif void dns_clear_host(unsigned char *name) { @@ -686,6 +678,7 @@ unsigned long dns_info(int type) { switch (type) { case CI_FILES: + shrink_dns_cache(SH_CHECK_QUOTA); return list_size(&dns_cache); default: internal_error("dns_info: bad request"); @@ -703,7 +696,7 @@ static int shrink_dns_cache(int u) d = list_struct(dns_cache.prev, struct dnsentry); goto delete_last; } - foreach(struct dnsentry, d, ld, dns_cache) if (u == SH_FREE_ALL || now - d->absolute_time > DNS_TIMEOUT) { + foreach(struct dnsentry, d, ld, dns_cache) if (u == SH_FREE_ALL || now - d->absolute_time >= d->timeout) { delete_last: ld = d->list_entry.prev; free_dns_entry(d); @@ -800,6 +793,7 @@ void flood_memory(void) while (1) { while ((de = mem_alloc_mayfail(s))) { de->absolute_time = get_absolute_time(); + de->timeout = DNS_TIMEOUT; memset(&de->addr, 0, sizeof de->addr); de->name[0] = 0; add_to_list(list, de); diff --git a/doh.c b/doh.c new file mode 100644 index 0000000..5588b3a --- /dev/null +++ b/doh.c @@ -0,0 +1,226 @@ +#include "links.h" + +struct dnsquery_addr { + struct status stat; + unsigned char *url; + int redirect_cnt; +}; + +struct dnsquery_doh { + struct dnsquery *q; + struct dnsquery_addr ipv4; + struct dnsquery_addr ipv6; + int in_progress; + uttime ttl; +}; + +#define skip_bytes(n) do { if (len < (n)) return; len -= (n); start += (n); } while (0) +#define get_byte(b) do { if (!len--) return; (b) = *start++; } while (0) +#define get_word(w) do { unsigned char lo, hi; get_byte(hi); get_byte(lo); (w) = (hi << 8) | lo; } while (0) +#define get_dword(d) do { unsigned short lw, hw; get_word(hw); get_word(lw); (d) = ((unsigned)hw << 16) | lw; } while (0) +#define skip_name() do while (1) { \ + unsigned char n; \ + get_byte(n); \ + if ((n & 0xc0) == 0) { \ + if (n == 0) \ + break; \ + skip_bytes(n); \ + continue; \ + } else if ((n & 0xc0) == 0xc0) { \ + skip_bytes(1); \ + break; \ + } else { \ + return; \ + } \ +} while (0) + +static void parse_dns_reply(struct dnsquery *q, unsigned char *start, size_t len) +{ + unsigned short status, qdcount, ancount, i; + struct dnsquery_doh *doh = q->doh; + int preference = q->addr_preference; +#ifdef SUPPORT_IPV6 + if (preference == ADDR_PREFERENCE_DEFAULT) + preference = ADDR_PREFERENCE_IPV6; +#endif + if (!support_ipv6) preference = ADDR_PREFERENCE_IPV4_ONLY; + skip_bytes(2); + get_word(status); + if (status & 0xf) + return; + get_word(qdcount); + get_word(ancount); + skip_bytes(4); + for (i = 0; i < qdcount; i++) { + skip_name(); + skip_bytes(4); + } + for (i = 0; i < ancount; i++) { + unsigned short typ, cls, rdlength; + unsigned ttl; + skip_name(); + get_word(typ); + get_word(cls); + get_dword(ttl); + if (ttl < doh->ttl) + doh->ttl = ttl; + get_word(rdlength); + skip_bytes(rdlength); + /*fprintf(stderr, "typ %04x, class %04x, length %04x\n", typ, cls, rdlength);*/ + if (q->addr) { + if (cls == 1 && typ == 1 && rdlength == 4) { + add_address(q->addr, AF_INET, start - rdlength, 0, preference); + } +#ifdef SUPPORT_IPV6 + if (cls == 1 && typ == 0x1c && rdlength == 16) { + add_address(q->addr, AF_INET6, start - rdlength, 0, preference); + } +#endif + } + } +} + +static void end_doh_lookup(struct dnsquery_doh *doh) +{ + uttime ttl; + struct dnsquery *q; + if (--doh->in_progress) + return; + q = doh->q; + ttl = doh->ttl; + mem_free(doh); + if (ttl * 1000 / 1000 != ttl) + ttl = -1; + else + ttl *= 1000; + end_dns_lookup(q, q->addr ? !q->addr->n : 1, ttl); +} + +static void doh_end(struct status *stat, void *doh_) +{ + struct dnsquery_doh *doh = (struct dnsquery_doh *)doh_; + struct dnsquery_addr *da = get_struct(stat, struct dnsquery_addr, stat); + struct cache_entry *ce; + + if (stat->state >= 0) + return; + + if (stat->state == S__OK && (ce = stat->ce)) { + if (ce->redirect && da->redirect_cnt++ < MAX_REDIRECTS) { + unsigned char *u; + u = join_urls(da->url, ce->redirect); + if (!strchr(cast_const_char u, POST_CHAR)) { + unsigned char *pc = cast_uchar strchr(cast_const_char da->url, POST_CHAR); + if (pc) + add_to_strn(&u, pc); + } + mem_free(da->url); + da->url = u; + load_url(u, NULL, &da->stat, PRI_DOH, NC_RELOAD, 1, 1, 0, 0); + return; + } + if (ce->http_code == 200) { + unsigned char *start; + size_t len; + get_file_by_term(NULL, ce, &start, &len, NULL); + parse_dns_reply(doh->q, start, len); + } + } + mem_free(da->url); + end_doh_lookup(doh); +} + +static int add_host_name(unsigned char **r, int *l, unsigned char *name) +{ + while (*name) { + size_t len = strcspn(cast_const_char name, "."); + if (!len || len > 63) + return -1; + add_chr_to_str(r, l, (unsigned char)len); + add_bytes_to_str(r, l, name, len); + name += len; + if (*name == '.') + name++; + } + add_chr_to_str(r, l, 0); + return 0; +} + +void do_doh_lookup(struct dnsquery *q) +{ + int p; + struct dnsquery_doh *doh; + int bad_name = 0; + + q->doh = doh = mem_calloc(sizeof(struct dnsquery_doh)); + doh->q = q; + doh->ttl = -1; + + for (p = 0; p < 2; p++) { + struct dnsquery_addr *da = !p ? &doh->ipv4 : &doh->ipv6; + unsigned char *u; + int ul; + unsigned char *r; + int rl; + int i; + + if (!p) { +#ifdef SUPPORT_IPV6 + if (q->addr_preference == ADDR_PREFERENCE_IPV6_ONLY) + continue; +#endif + } else { +#ifndef SUPPORT_IPV6 + continue; +#endif + if (q->addr_preference == ADDR_PREFERENCE_IPV4_ONLY) + continue; + } + + doh->in_progress++; + da->stat.end = doh_end; + da->stat.data = doh; + + u = init_str(); + ul = 0; + memset(q->addr, 0, sizeof(struct lookup_result)); + if (!casecmp(dns_over_https, cast_uchar "http://", 7) || !casecmp(dns_over_https, cast_uchar "https://", 8)) { + add_to_str(&u, &ul, dns_over_https); + } else { + add_to_str(&u, &ul, cast_uchar "https://"); + add_to_str(&u, &ul, dns_over_https); + add_to_str(&u, &ul, cast_uchar "/dns-query"); + } + add_chr_to_str(&u, &ul, POST_CHAR); + add_to_str(&u, &ul, cast_uchar "application/dns-message\n"); + + r = init_str(); + rl = 0; + add_bytes_to_str(&r, &rl, cast_uchar "\0\0\1\0\0\1\0\0\0\0\0\0", 12); + if (add_host_name(&r, &rl, q->name)) + bad_name = 1; + if (!p) + add_bytes_to_str(&r, &rl, cast_uchar "\0\1\0\1", 4); + else + add_bytes_to_str(&r, &rl, cast_uchar "\0\34\0\1", 4); + + for (i = 0; i < rl; i++) { + unsigned char p[3]; + sprintf(cast_char p, "%02x", (int)r[i]); + add_bytes_to_str(&u, &ul, p, 2); + } + mem_free(r); + da->url = u; + } + for (p = 0; p < 2; p++) { + struct dnsquery_addr *da = !p ? &doh->ipv4 : &doh->ipv6; + if (da->url) { + if (bad_name) { + mem_free(da->url); + end_doh_lookup(doh); + } else { + load_url(da->url, NULL, &da->stat, PRI_DOH, NC_RELOAD, 1, 1, 0, 0); + } + } + } +} diff --git a/framebuf.c b/framebuf.c index a3ab75d..6d5a3b8 100644 --- a/framebuf.c +++ b/framebuf.c @@ -1068,8 +1068,10 @@ static void fb_ps2_in(void *nic) if (dw & 0x08) dw |= -0x10; } - mouse_x += dx; - mouse_y += dy; + if (fb_active) { + mouse_x += dx; + mouse_y += dy; + } if (mouse_x >= fb_xsize) mouse_x = fb_xsize - 1; if (mouse_y >= fb_ysize) mouse_y = fb_ysize - 1; @@ -2077,7 +2079,7 @@ static int fb_block(struct graphics_device *dev) fb_block_dev = dev; unhandle_fb_mouse(); fb_old_vd = current_virtual_device; - current_virtual_device=NULL; + current_virtual_device = NULL; svgalib_block_itrm(fb_kbd); if (have_cmap && fb_active) set_palette(&old_palette); EINTRLOOP(rs, fsync(fb_handle)); diff --git a/ftp.c b/ftp.c index 05d3178..7a8d05d 100644 --- a/ftp.c +++ b/ftp.c @@ -273,14 +273,14 @@ static struct ftp_connection_info *add_file_cmd_to_str(struct connection *c, int } if (strlen(cast_const_char port_string) >= sizeof(port_string)) internal_error("buffer overflow in get_pasv_socket_ipv6: %d > %d", (int)strlen(cast_const_char port_string), (int)sizeof(port_string)); - } #ifdef HAVE_IPTOS - if (ftp_options.set_tos) { - int rx; - int on = IPTOS_THROUGHPUT; - EINTRLOOP(rx, setsockopt(c->sock2, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int))); - } + if (ftp_options.set_tos) { + int rx; + int on = IPTOS_THROUGHPUT; + EINTRLOOP(rx, setsockopt(c->sock2, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int))); + } #endif + } dd = d; while (*dd == '/') dd++; de = cast_uchar strchr(cast_const_char dd, 0); diff --git a/html.c b/html.c index 9a74ca3..1d3c4cd 100644 --- a/html.c +++ b/html.c @@ -2728,7 +2728,7 @@ static void html_link(unsigned char *a) !casestrcmp(name, cast_uchar "prerender") || !casestrcmp(name, cast_uchar "preload")) { unsigned char *pre_url = join_urls(format_.href_base, url); - if (!dmp) load_url(pre_url, format_.href_base, NULL, PRI_PRELOAD, NC_ALWAYS_CACHE, 0, 0, 0); + if (!dmp) load_url(pre_url, format_.href_base, NULL, PRI_PRELOAD, NC_ALWAYS_CACHE, 0, 0, 0, 0); mem_free(pre_url); goto skip; } diff --git a/html_tbl.c b/html_tbl.c index fc265f0..6ae43b3 100644 --- a/html_tbl.c +++ b/html_tbl.c @@ -456,6 +456,7 @@ static struct table *parse_table(unsigned char *html, unsigned char *eof, unsign int i, j, k; struct rgb l_col; int c_al = AL_TR, c_val = VAL_TR, c_width = W_AUTO, c_span = 0; + int norow = 1; memcpy(&l_col, bgcolor, sizeof(struct rgb)); *end = html; if (bad_html) { @@ -542,6 +543,7 @@ static struct table *parse_table(unsigned char *html, unsigned char *eof, unsign c_span = 0; goto see; } + if (t_namelen == 3 && !casecmp(t_name, cast_uchar "/TR", 3)) norow = 1; if (t_namelen == 3 && (!casecmp(t_name, cast_uchar "/TR", 3) || !casecmp(t_name, cast_uchar "/TD", 3) || !casecmp(t_name, cast_uchar "/TH", 3))) { if (c_span) new_columns(t, c_span, c_width, c_al, c_val, 1); if (p) CELL(t, x, y)->end = html, p = 0; @@ -560,6 +562,7 @@ static struct table *parse_table(unsigned char *html, unsigned char *eof, unsign get_valign(t_attr, &l_val); get_bgcolor(t_attr, &l_col); y++, x = 0; + norow = 0; goto see; } if (t_namelen == 5 && ((!casecmp(t_name, cast_uchar "THEAD", 5)) || (!casecmp(t_name, cast_uchar "TBODY", 5)) || (!casecmp(t_name, cast_uchar "TFOOT", 5)))) { @@ -573,6 +576,7 @@ static struct table *parse_table(unsigned char *html, unsigned char *eof, unsign if (lbhp) (*bad_html)[*bhp-1].e = html, lbhp = NULL; if (p) CELL(t, x, y)->end = html, p = 0; if (y == -1) y = 0, x = 0; + if (norow && x) y++, x = 0, norow = 0; nc: cell = new_cell(t, x, y); if (cell->used) { diff --git a/http.c b/http.c index 5c55f66..3e1284e 100644 --- a/http.c +++ b/http.c @@ -23,7 +23,7 @@ static void http_get_header(struct connection *c); static void test_restart(struct connection *c); static void add_user_agent(unsigned char **hdr, int *l, unsigned char *url); static void add_referer(unsigned char **hdr, int *l, unsigned char *url, unsigned char *prev_url); -static void add_accept(unsigned char **hdr, int *l); +static void add_accept(unsigned char **hdr, int *l, struct connection *c); static void add_accept_language(unsigned char **hdr, int *l, struct http_connection_info *info); static void add_accept_encoding(unsigned char **hdr, int *l, unsigned char *url, struct connection *c); static void add_accept_charset(unsigned char **hdr, int *l, struct http_connection_info *info); @@ -484,20 +484,28 @@ static void http_send_header(struct connection *c) if (proxy) add_proxy_auth_string(&hdr, &l, c->url); if (!info->https_forward) { test_restart(c); - add_referer(&hdr, &l, host, c->prev_url); - add_accept(&hdr, &l); - add_accept_language(&hdr, &l, info); - add_accept_encoding(&hdr, &l, host, c); - add_accept_charset(&hdr, &l, info); + if (!c->doh) { + add_referer(&hdr, &l, host, c->prev_url); + } + add_accept(&hdr, &l, c); + if (!c->doh) { + add_accept_language(&hdr, &l, info); + add_accept_encoding(&hdr, &l, host, c); + add_accept_charset(&hdr, &l, info); + } add_dnt(&hdr, &l); add_connection(&hdr, &l, http10, proxy, !info->send_close); - add_upgrade(&hdr, &l); - add_if_modified(&hdr, &l, c); - add_range(&hdr, &l, host, c); - add_pragma_no_cache(&hdr, &l, c->no_cache); - add_auth_string(&hdr, &l, host); + if (!c->doh) { + add_upgrade(&hdr, &l); + add_if_modified(&hdr, &l, c); + add_range(&hdr, &l, host, c); + add_pragma_no_cache(&hdr, &l, c->no_cache); + add_auth_string(&hdr, &l, host); + } add_post_header(&hdr, &l, &post); - add_cookies(&hdr, &l, host); + if (!c->doh) { + add_cookies(&hdr, &l, host); + } add_extra_options(&hdr, &l); } add_to_str(&hdr, &l, cast_uchar "\r\n"); @@ -543,7 +551,7 @@ static void add_user_agent(unsigned char **hdr, int *l, unsigned char *url) { add_to_str(hdr, l, cast_uchar "User-Agent: "); if (SCRUB_HEADERS) { - add_to_str(hdr, l, cast_uchar "Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Firefox/78.0\r\n"); + add_to_str(hdr, l, cast_uchar "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0\r\n"); } else if (!(*http_options.header.fake_useragent)) { /* @@ -648,9 +656,11 @@ static void add_referer(unsigned char **hdr, int *l, unsigned char *url, unsigne } } -static void add_accept(unsigned char **hdr, int *l) +static void add_accept(unsigned char **hdr, int *l, struct connection *c) { - if (SCRUB_HEADERS) { + if (c->doh) { + add_to_str(hdr, l, cast_uchar "Accept: application/dns-message\r\n"); + } else if (SCRUB_HEADERS) { add_to_str(hdr, l, cast_uchar "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"); } else { add_to_str(hdr, l, cast_uchar "Accept: */*\r\n"); @@ -1149,7 +1159,7 @@ static void http_got_header(struct connection *c, struct read_buffer *rb) return; } #endif - if (h != 401 && h != 407) { + if (h != 401 && h != 407 && !c->doh) { unsigned char *cookie; unsigned char *ch = head; while ((cookie = parse_http_header(ch, cast_uchar "Set-Cookie", &ch))) { @@ -1212,6 +1222,8 @@ static void http_got_header(struct connection *c, struct read_buffer *rb) e->http_code = h; if (e->head) mem_free(e->head); e->head = head; + if (c->doh) + e->expire_time = 1; if ((d = parse_http_header(head, cast_uchar "Expires", NULL))) { time_t t = parse_http_date(d); if (t != (time_t)-1 && e->expire_time != 1) e->expire_time = t; @@ -1352,12 +1364,15 @@ static void http_got_header(struct connection *c, struct read_buffer *rb) /* * Truncate entry if: + * - we are using DNS-over-HTTPS * - it is compressed (the mix of an old and new document * would likely produce decompression error). * - it was http authentication (the user doesn't need to see the * authentication message). */ - if ((d = parse_http_header(e->head, cast_uchar "Content-Encoding", NULL))) { + if (c->doh) { + truncate_entry(e, c->from, 0); + } else if ((d = parse_http_header(e->head, cast_uchar "Content-Encoding", NULL))) { mem_free(d); truncate_entry(e, c->from, 0); } else if (previous_http_code == 401 || previous_http_code == 407) { diff --git a/https.c b/https.c index 658f9f3..ffe8167 100644 --- a/https.c +++ b/https.c @@ -325,7 +325,7 @@ links_ssl *getSSL(void) ssl_load_private_certificates(ctx); #endif } -#ifdef X509_V_FLAG_TRUSTED_FIRST +#if defined(HAVE_X509_VERIFY_PARAM_SET_FLAGS) && defined(X509_V_FLAG_TRUSTED_FIRST) #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10003000 X509_VERIFY_PARAM_set_flags(SSL_CTX_get_cert_store(ctx)->param, X509_V_FLAG_TRUSTED_FIRST); #else diff --git a/img.c b/img.c index 3cd4ed1..c678ef1 100644 --- a/img.c +++ b/img.c @@ -60,6 +60,11 @@ static void destroy_decoder (struct cached_image *cimg) case IM_SVG: svg_destroy_decoder(cimg); break; +#endif +#ifdef HAVE_WEBP + case IM_WEBP: + webp_destroy_decoder(cimg); + break; #endif } mem_free(cimg->decoder); @@ -773,6 +778,10 @@ static void type(struct cached_image *cimg, unsigned char *content_type, unsigne #ifdef HAVE_SVG if (data[0] == '<' && data[1] == '?') goto have_svg; +#endif +#ifdef HAVE_WEBP + if (data[0] == 'R' && data[1] == 'I' && data[2] == 'F' && data[3] == 'F') + goto have_webp; #endif if (data[0] == 0x89 && data[1] == 'P' && data[2] == 'N' && data[3] == 'G') goto have_png; @@ -819,6 +828,13 @@ static void type(struct cached_image *cimg, unsigned char *content_type, unsigne svg_start(cimg); } else #endif /* #ifdef HAVE_SVG */ +#ifdef HAVE_WEBP + if (dtest(cast_uchar "image/webp",content_type)) { + have_webp: + cimg->image_type=IM_WEBP; + webp_start(cimg); + } else +#endif /* #ifdef HAVE_WEBP */ { /* Error */ img_end(cimg); @@ -916,6 +932,11 @@ static int img_process_download(struct g_object_image *goi, struct f_data_c *fda svg_restart(cimg,data,length); break; #endif /* #ifdef HAVE_SVG */ +#ifdef HAVE_WEBP + case IM_WEBP: + webp_restart(cimg,data,length); + break; +#endif /* #ifdef HAVE_WEBP */ #ifdef DEBUG default: fprintf(stderr,"cimg->image_type=%d\n",cimg->state); @@ -942,6 +963,10 @@ img_process_download.\n"); #ifdef HAVE_SVG if (cimg->image_type==IM_SVG) svg_finish(cimg); +#endif +#ifdef HAVE_WEBP + if (cimg->image_type==IM_WEBP) + webp_finish(cimg); #endif } cimg->eof_hit=1; @@ -1345,6 +1370,9 @@ int known_image_type(unsigned char *type) if (!casestrcmp(type, cast_uchar "image/svg+xml")) return 1; if (!casestrcmp(type, cast_uchar "image/svg")) return 1; #endif +#ifdef HAVE_WEBP + if (!casestrcmp(type, cast_uchar "image/webp")) return 1; +#endif #endif return 0; } diff --git a/intl/bahasa_indonesian.lng b/intl/bahasa_indonesian.lng index a275230..fda50a5 100644 --- a/intl/bahasa_indonesian.lng +++ b/intl/bahasa_indonesian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Angka melebihi batas", T_BAD_STRING, "Salah string", T_EMPTY_STRING_NOT_ALLOWED, "String kosong tidak dibolehkan", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Salah konfigurasi", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Tidak dapat menulis pada berkas konfigurasi", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Hubungan", T_MAX_CONNECTIONS, "Batas hubungan", T_MAX_CONNECTIONS_TO_ONE_HOST, "Batas hubungan untuk satu host", @@ -502,20 +503,22 @@ T_MANUAL, "Panduan pengguna", T_HOMEPAGE, "Halaman rumah", T_CALIBRATION, "Pengukuran", T_MAILTO_PROG, "Program surat (% diganti dengan alamat)", -T_SHELL_PROG, "Shell untuk menjalankan perintah eksternal (% diganti dengan perintah)", T_TELNET_PROG, "Program telnet (% diganti dengan \"host\" atau \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Program Tn3270 (% diganti dengan \"host\" atau \"host port\")", T_MMS_PROG, "Program MMS (% diganti dengan URL)", +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Shell untuk menjalankan perintah eksternal (% diganti dengan perintah)", T_MAIL_AND_TELNET_PROGRAMS, "Program Mail dan telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Program surat, telnet dan shell", T_NO_PROGRAM, "Tidak ada program", T_NO_PROGRAM_SPECIFIED_FOR, "Tidak ada program diberikan untuk", T_MAIL, "surat", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "URL mailto salah", T_BAD_TELNET_URL, "URL telnet salah", T_BAD_TN3270_URL, "URL tn3270 salah", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/belarusian.lng b/intl/belarusian.lng index 8c67141..be93a77 100644 --- a/intl/belarusian.lng +++ b/intl/belarusian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, "צ ", T_EMPTY_STRING_NOT_ALLOWED, " ˦ ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " ˦", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " Ц ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Ѯ", T_MAX_CONNECTIONS, ". Ѯ", T_MAX_CONNECTIONS_TO_ONE_HOST, ". Ѯ ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, " ˦ (% )", -T_SHELL_PROG, NULL, T_TELNET_PROG, " telnet (% 'host' æ 'host port')", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " tn3270 (% 'host' æ 'host port')", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, " telnet'", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "צ mailto:", T_BAD_TELNET_URL, "צ telnet", T_BAD_TN3270_URL, "צ tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/brazilian_portuguese.lng b/intl/brazilian_portuguese.lng index 38b5906..2bb6ae5 100644 --- a/intl/brazilian_portuguese.lng +++ b/intl/brazilian_portuguese.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "N T_BAD_STRING, "Sequncia de caracteres invlida", T_EMPTY_STRING_NOT_ALLOWED, "No permitido sequncia de caracteres vazia", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Erro de configurao", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "No posso escrever no arquivo de configurao", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Conexes", T_MAX_CONNECTIONS, "Nmero mximo de conexes", T_MAX_CONNECTIONS_TO_ONE_HOST, "Nmero Mximo de conexes a um host", @@ -502,20 +503,22 @@ T_MANUAL, "Manual do Usu T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Cliente de e-mail (% ser substituido pelo endereo)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Cliente telnet (% ser substituido por \"host\" or \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Cliente tn3270 (% ser substituido por \"host\" or \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Clientes de e-mail e telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nenhum programa", T_NO_PROGRAM_SPECIFIED_FOR, "Nenhum programa foi especificado para", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "URL mailto incorreta", T_BAD_TELNET_URL, "URL telnet incorreta", T_BAD_TN3270_URL, "URL tn3270 incorreta", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/bulgarian.lng b/intl/bulgarian.lng index 248e437..ebf3669 100644 --- a/intl/bulgarian.lng +++ b/intl/bulgarian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, " ", T_EMPTY_STRING_NOT_ALLOWED, " ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " ", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "()", T_MAX_CONNECTIONS, ". ", T_MAX_CONNECTIONS_TO_ONE_HOST, ". ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, " (% )", -T_SHELL_PROG, NULL, T_TELNET_PROG, " telnet (% 'host' 'host port')", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " tn3270 (% 'host' 'host port')", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, " telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, " mailto:", T_BAD_TELNET_URL, " telnet", T_BAD_TN3270_URL, " tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/catalan.lng b/intl/catalan.lng index ea34d20..d5ae88f 100644 --- a/intl/catalan.lng +++ b/intl/catalan.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Nombre fora de rang", T_BAD_STRING, "Cadena incorrecta", T_EMPTY_STRING_NOT_ALLOWED, "No s'hi permeten cadenes buides", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Error de configuraci", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "No ha estat possible escriure en l'arxiu de configuraci", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Connexions", T_MAX_CONNECTIONS, "Mxim de connexions", T_MAX_CONNECTIONS_TO_ONE_HOST, "Mxim de connexions a una mquina", @@ -502,20 +503,22 @@ T_MANUAL, "Manual de l'usuari", T_HOMEPAGE, "Pgina inicial", T_CALIBRATION, "Calibratge", T_MAILTO_PROG, "Programa de correu (% s substitut per l'adrea)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Programa de telnet (% s substitut per \"host\" o per \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Programa tn3270 (% s substitut per \"host\" o per \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Programes de correu i de telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Cap programa", T_NO_PROGRAM_SPECIFIED_FOR, "No hi ha cap programa especificat per a", T_MAIL, "correu", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Adrea de correu incorrecta", T_BAD_TELNET_URL, "Adrea de telnet incorrecta", T_BAD_TN3270_URL, "Adrea de tn3270 incorrecta", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/croatian.lng b/intl/croatian.lng index d143d4c..1163256 100644 --- a/intl/croatian.lng +++ b/intl/croatian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Broj izvan opsega", T_BAD_STRING, "Neispravan niz znakova", T_EMPTY_STRING_NOT_ALLOWED, "Prazni niz znakova nije dozvoljen", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Greka u konfiguraciji", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Ne mogu pisati u konfiguracijsku datoteku", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Veze", T_MAX_CONNECTIONS, "Maksimanlno veza", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksimalno veza na jedno raunalo", @@ -502,20 +503,22 @@ T_MANUAL, "Upute za korisnika", T_HOMEPAGE, "Polazna stranica", T_CALIBRATION, "Kalibracija", T_MAILTO_PROG, "Mail program (% e biti zamijenjeno adresom)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet program (% e se zamijeniti sa \"host\" ili \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 program (% e biti zamijenjeno sa \"raunalo\" ili \"raunalo port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Mail i telnet programi", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nema programa", T_NO_PROGRAM_SPECIFIED_FOR, "Nema programa za", T_MAIL, "email", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Neispravan mailto url", T_BAD_TELNET_URL, "Neispravan telnet url", T_BAD_TN3270_URL, "Neispravan tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/czech.lng b/intl/czech.lng index 8e561a5..21ad296 100644 --- a/intl/czech.lng +++ b/intl/czech.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, "Chybn etzec", T_EMPTY_STRING_NOT_ALLOWED, "Mus zadat njak text!", T_BAD_IP_ADDRESS, "Chybn IP addresa", -T_INVALID_IP_ADDRESS_SYNTAX, "Chyn syntax IP adresy", T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Nemohu pout lokln IP adresu", T_CONFIG_ERROR, "Chyba v konfiguraci", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nemu zapisovat do konfiguranho souboru", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, "Soubor neexistuje", T_THE_FILE_HAS_INVALID_FORMAT, "Soubor m patn formt", T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, "Chyba pi inicializaci vestavnch certifikt", T_FAILED, "selhalo", +T_DNS_OPTIONS, "DNS nastaven", +T_DNS_OVER_HTTPS_URL, "DNS pes HTTPS (host nebo url)", T_CONNECTIONS, "Spojen", T_MAX_CONNECTIONS, "Maximln spojen", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maximln spojen k jednomu stroji", @@ -502,20 +503,22 @@ T_MANUAL, "Manu T_HOMEPAGE, "Domc strnka", T_CALIBRATION, "Kalibrace", T_MAILTO_PROG, "Program pro mail (% je nahrazeno adresou)", -T_SHELL_PROG, "Shell pro spoutn externch pkaz (% je nahrazeno pkazem)", T_TELNET_PROG, "Program pro telnet (% je nahrazeno jmnem stroje a ppadn portem)", -T_MAGNET_PROG, "Program pro magnet (% je nahrazeno URL)", T_TN3270_PROG, "Program pro tn3270 (% je nahrazeno jmnem stroje a ppadn portem)", T_MMS_PROG, "Program pro mms (% je nahrazeno URL)", +T_MAGNET_PROG, "Program pro magnet (% je nahrazeno URL)", +T_GOPHER_PROG, "Program pro gopher (% je nahrazeno URL)", +T_SHELL_PROG, "Shell pro spoutn externch pkaz (% je nahrazeno pkazem)", T_MAIL_AND_TELNET_PROGRAMS, "Programy pro mail a telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Programy pro mail, telnet a shell", T_NO_PROGRAM, "dn program", T_NO_PROGRAM_SPECIFIED_FOR, "Nen zadn dn program pro", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, "magnet", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "magnet", +T_GOPHER, "gopher", T_BAD_MAILTO_URL, "patn mailto url", T_BAD_TELNET_URL, "patn telnet url", T_BAD_TN3270_URL, "patn tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, "S", T_HK_IPV6_OPTIONS, "I", T_HK_PROXIES, "P", T_HK_SSL_OPTIONS, "L", +T_HK_DNS_OPTIONS, "D", T_HK_HTTP_OPTIONS, "H", T_HK_FTP_OPTIONS, "F", T_HK_SMB_OPTIONS, "M", diff --git a/intl/danish.lng b/intl/danish.lng index fe5b83a..2f72d98 100644 --- a/intl/danish.lng +++ b/intl/danish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Nummer uden for omr T_BAD_STRING, "Fejl i tekststreng", T_EMPTY_STRING_NOT_ALLOWED, "Tom tekststreng ikke tilladt", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfigurationsfejl", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Kan ikke skrive til konfigurationsfil", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Forbindelser", T_MAX_CONNECTIONS, "Max forbindelser", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max forbindelser til en vrt", @@ -502,20 +503,22 @@ T_MANUAL, "Brugervejledning", T_HOMEPAGE, "Hjemmeside", T_CALIBRATION, "Kalibrering", T_MAILTO_PROG, "Epostprogram (% erstattes med adresse)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Program til fjernlogin (% erstattes med \"vrt\" eller \"vrt port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270-program (% erstattes med \"vrt\" eller \"vrt port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Program til epost og fjernlogin", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Intet program", T_NO_PROGRAM_SPECIFIED_FOR, "Intet program angivet for", T_MAIL, "epost", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Fejl i mailto URL", T_BAD_TELNET_URL, "Fejl i telnet URL", T_BAD_TN3270_URL, "Fejl i tn3270 URL", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/dutch.lng b/intl/dutch.lng index e871eee..c1a9c4d 100644 --- a/intl/dutch.lng +++ b/intl/dutch.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Number buiten het bereik", T_BAD_STRING, "Onjuiste string", T_EMPTY_STRING_NOT_ALLOWED, "Lege string niet toegestaan", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Configuratie fout", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Niet mogelijk om naar het configuratiebestand te schrijven", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Verbindingen", T_MAX_CONNECTIONS, "Max verbindingen", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max verbindingen naar n host", @@ -502,20 +503,22 @@ T_MANUAL, "Gebruikershandleiding", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Mail programma (% is vervangen met adres)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet programma (% is vervangen met \"host\" of \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 programma (% is vervangen met \"host\" of \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Mail en telnet programma's", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Geen programma", T_NO_PROGRAM_SPECIFIED_FOR, "Geen programma gespecificieerd voor", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Onjuiste mailto url", T_BAD_TELNET_URL, "Onjuiste telnet url", T_BAD_TN3270_URL, "Onjuiste tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/english.lng b/intl/english.lng index 694a925..6924ade 100644 --- a/intl/english.lng +++ b/intl/english.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Number out of range", T_BAD_STRING, "Bad string", T_EMPTY_STRING_NOT_ALLOWED, "Empty string not allowed", T_BAD_IP_ADDRESS, "Bad IP address", -T_INVALID_IP_ADDRESS_SYNTAX, "Invalid IP address syntax", T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Unable to use local IP address", T_CONFIG_ERROR, "Config error", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Unable to write to config file", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, "The file does not exist", T_THE_FILE_HAS_INVALID_FORMAT, "The file has invalid format", T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, "Error initializing built-in certificates", T_FAILED, "failed", +T_DNS_OPTIONS, "DNS options", +T_DNS_OVER_HTTPS_URL, "DNS over HTTPS (host or url)", T_CONNECTIONS, "Connections", T_MAX_CONNECTIONS, "Max connections", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max connections to one host", @@ -502,20 +503,22 @@ T_MANUAL, "User's manual", T_HOMEPAGE, "Home page", T_CALIBRATION, "Calibration", T_MAILTO_PROG, "Mail program (% is replaced with address)", -T_SHELL_PROG, "Shell for executing external commands (% is replaced with command)", T_TELNET_PROG, "Telnet program (% is replaced with \"host\" or \"host port\")", -T_MAGNET_PROG, "Magnet program (% is replaced with URL)", T_TN3270_PROG, "Tn3270 program (% is replaced with \"host\" or \"host port\")", T_MMS_PROG, "MMS program (% is replaced with URL)", +T_MAGNET_PROG, "Magnet program (% is replaced with URL)", +T_GOPHER_PROG, "Goher program (% is replaced with URL)", +T_SHELL_PROG, "Shell for executing external commands (% is replaced with command)", T_MAIL_AND_TELNET_PROGRAMS, "Mail and telnet programs", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Mail, telnet and shell programs", T_NO_PROGRAM, "No program", T_NO_PROGRAM_SPECIFIED_FOR, "No program specified for", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, "magnet", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "magnet", +T_GOPHER, "gopher", T_BAD_MAILTO_URL, "Bad mailto url", T_BAD_TELNET_URL, "Bad telnet url", T_BAD_TN3270_URL, "Bad tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, "C", T_HK_IPV6_OPTIONS, "I", T_HK_PROXIES, "P", T_HK_SSL_OPTIONS, "L", +T_HK_DNS_OPTIONS, "D", T_HK_HTTP_OPTIONS, "H", T_HK_FTP_OPTIONS, "F", T_HK_SMB_OPTIONS, "S", diff --git a/intl/estonian.lng b/intl/estonian.lng index dd8fc77..1006033 100644 --- a/intl/estonian.lng +++ b/intl/estonian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Number v T_BAD_STRING, "Ebasobiv string", T_EMPTY_STRING_NOT_ALLOWED, "Thi string pole lubatud", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfiguratsiooni viga", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Ei saa kirjutada konfiguratsioonifaili", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "hendused", T_MAX_CONNECTIONS, "Maksimaalselt hendusi", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksimaalselt hendusi hele hostile", @@ -502,20 +503,22 @@ T_MANUAL, "Kasutamisjuhend", T_HOMEPAGE, "Koduleheklg", T_CALIBRATION, "Kalibreerimine", T_MAILTO_PROG, "Mailiprogramm (% asendatakse aadressiga)", -T_SHELL_PROG, "Shell vliste programmide kivitamiseks (% asendatakse ksuga)", T_TELNET_PROG, "Telneti programm (% asendatakse \"host\" vi \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 programm (% asendatakse \"host\" vi \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Shell vliste programmide kivitamiseks (% asendatakse ksuga)", T_MAIL_AND_TELNET_PROGRAMS, "Maili ja telneti programmid", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Maili, telneti ja shelli programmid", T_NO_PROGRAM, "Pole programmi", T_NO_PROGRAM_SPECIFIED_FOR, "Pole programmi mrgitud", T_MAIL, NULL, T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Vigane mailto url", T_BAD_TELNET_URL, "Vigane telnet url", T_BAD_TN3270_URL, "Vigane tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/finnish.lng b/intl/finnish.lng index 2f0370d..3527c00 100644 --- a/intl/finnish.lng +++ b/intl/finnish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Numero yli lukualueen", T_BAD_STRING, "Laiton merkkijono", T_EMPTY_STRING_NOT_ALLOWED, "Tyhj merkkijono ei sallittu", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Asetuksissa virhe", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Asetustiedoston kirjoitus ei onnistu", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Yhteydet", T_MAX_CONNECTIONS, "Yhteyksien maksimilkm", T_MAX_CONNECTIONS_TO_ONE_HOST, "Yhteyksien maksimilkm yhteen kohteeseen", @@ -502,20 +503,22 @@ T_MANUAL, "K T_HOMEPAGE, "Kotisivu", T_CALIBRATION, "Kalibrointi", T_MAILTO_PROG, "Shkpostiohjelma (% korvataan osoitteella)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet-ohjelma (% korvataan \"osoitteella\" tai \"portilla\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270-ohjelma (% korvataan \"osoitteella\" tai \"portilla\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Shkposti- tai telnetohjelmat", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Ei ohjelmaa", T_NO_PROGRAM_SPECIFIED_FOR, "Ei ohjelmaa osoitettu", T_MAIL, "shkposti", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Laiton shkposti-URL", T_BAD_TELNET_URL, "Laiton telnet-URL", T_BAD_TN3270_URL, "Laiton tn3270-URL", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/french.lng b/intl/french.lng index 61dde5d..c910cad 100644 --- a/intl/french.lng +++ b/intl/french.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Intervalle incorrect", T_BAD_STRING, "Saisie erronne", T_EMPTY_STRING_NOT_ALLOWED, "Saisie obligatoire", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Erreur de configuration", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Impossible d'crire la configuration", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Connexions", T_MAX_CONNECTIONS, "Nombre maximum de connexions", T_MAX_CONNECTIONS_TO_ONE_HOST, "Nombre maximum de connexions un serveur", @@ -502,20 +503,22 @@ T_MANUAL, "Manuel", T_HOMEPAGE, "Page d'accueil", T_CALIBRATION, "Calibration", T_MAILTO_PROG, "Programme E-Mail (% = adresse)", -T_SHELL_PROG, "Programme Shell (% = commande)", T_TELNET_PROG, "Programme Telnet (% = port hte)", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Programme TN3270 (% = port hte)", T_MMS_PROG, "Programme MMS (% = URL)", +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Programme Shell (% = commande)", T_MAIL_AND_TELNET_PROGRAMS, "Clients e-mail/telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Clients e-mail/telnet/shell", T_NO_PROGRAM, "Pas de programme", T_NO_PROGRAM_SPECIFIED_FOR, "Aucun programme n'est dfini pour ", T_MAIL, "e-mail", T_TELNET, "Telnet", -T_MAGNET, NULL, T_TN3270, "TN3270", T_MMS, "mms", +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Adresse e-mail incorrecte", T_BAD_TELNET_URL, "Adresse Telnet incorrecte", T_BAD_TN3270_URL, "Adresse TN3270 incorrecte", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/galician.lng b/intl/galician.lng index 95dcce1..034decf 100644 --- a/intl/galician.lng +++ b/intl/galician.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "N T_BAD_STRING, "Cadea non vlida", T_EMPTY_STRING_NOT_ALLOWED, "Non se permite unha cadea baleira", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Erro de configuracin", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Non se puido escribir no ficheiro de configuracin", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Conexins", T_MAX_CONNECTIONS, "Mximo de conexins", T_MAX_CONNECTIONS_TO_ONE_HOST, "Mximo de conexins a unha mquina", @@ -502,20 +503,22 @@ T_MANUAL, "Manual de usuario", T_HOMEPAGE, "Pxina de inicio", T_CALIBRATION, "Calibrar", T_MAILTO_PROG, "Programa de correo (% remprazado pola direccin)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Programa de telnet (% remprazado por \"mquina\" ou \"mquina porto\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Programa de Tn3270 (% remprazado por \"mquina\" ou \"mquina porto\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Programas de correo e telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Sen programa", T_NO_PROGRAM_SPECIFIED_FOR, "Sen programa especificado para", T_MAIL, "correo", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "URL mailto errnea", T_BAD_TELNET_URL, "URL telnet errnea", T_BAD_TN3270_URL, "URL tn3270 errnea", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/german.lng b/intl/german.lng index ea055e2..f35db8e 100644 --- a/intl/german.lng +++ b/intl/german.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Ung T_BAD_STRING, "Falsche Eingabe", T_EMPTY_STRING_NOT_ALLOWED, "Werteingabe erforderlich", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfigurationsfehler", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Kann Konfigurationsdatei nicht schreiben", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Verbindungen", T_MAX_CONNECTIONS, "Max. Verbindungen", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max. Verbindungen zu einem Server", @@ -219,7 +220,7 @@ T_FRAME_AT_FULL_SCREEN, "Rahmen im Vollbildschirm", T_SAVE_CLIPBOARD_TO_A_FILE, NULL, T_LOAD_CLIPBOARD_FROM_A_FILE, NULL, T_THE_CLIPBOARD_IS_EMPTY, NULL, -T_SAVE_HTML_OPTIONS, "HTML Sicherheit", +T_SAVE_HTML_OPTIONS, "Speichere HTML Optionen", T_CHARACTER_SET, "Zeichensatz", T_DEFAULT_CHARSET, NULL, T_CACHE, "Cache", @@ -502,20 +503,22 @@ T_MANUAL, "Manual", T_HOMEPAGE, "Homepage", T_CALIBRATION, "Kalibration", T_MAILTO_PROG, "Mail-Programm (% wird mit Email-Addresse ersetzt)", -T_SHELL_PROG, "Shell-Programm fr externe Aufrufe (% wird mit Kommando ersetzt)", T_TELNET_PROG, "Telnet-Programm (% wird mit \"host\" oder \"host port\" ersetzt)", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "TN3270-Programm (% wird mit \"host\" oder \"host port\" ersetzt)", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Shell-Programm fr externe Aufrufe (% wird mit Kommando ersetzt)", T_MAIL_AND_TELNET_PROGRAMS, "Mail-/Telnet-Programme", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Mail-/Telnet-/Shell-Programme", T_NO_PROGRAM, "Kein Programm", T_NO_PROGRAM_SPECIFIED_FOR, "Programm nicht definiert fr ", T_MAIL, "Mail", T_TELNET, "Telnet", -T_MAGNET, NULL, T_TN3270, "TN3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "fehlerhafte Mailadresse", T_BAD_TELNET_URL, "fehlerhafte Telnetadresse", T_BAD_TN3270_URL, "fehlerhafte TN3270-Adresse", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/greek.lng b/intl/greek.lng index 1c2c821..41b4077 100644 --- a/intl/greek.lng +++ b/intl/greek.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, " ", T_EMPTY_STRING_NOT_ALLOWED, " ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " ", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "", T_MAX_CONNECTIONS, " ", T_MAX_CONNECTIONS_TO_ONE_HOST, " ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, " ( % )", -T_SHELL_PROG, NULL, T_TELNET_PROG, " telnet ( % \"\" \" \")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " Tn3270 ( % \"\" \" \")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, " telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, " URL mailto", T_BAD_TELNET_URL, " URL telnet", T_BAD_TN3270_URL, " URL tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/hungarian.lng b/intl/hungarian.lng index 0e2d51c..382f10f 100644 --- a/intl/hungarian.lng +++ b/intl/hungarian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Sz T_BAD_STRING, "Hibs szveg", T_EMPTY_STRING_NOT_ALLOWED, "res szveg nem engedlyezett", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Belltsi hiba", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nem rhat a konfigurcis fjl", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Kapcsolatok", T_MAX_CONNECTIONS, "Maximlis kapcsolatok", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maximlis kapcsolatok egy kiszolglhoz", @@ -502,20 +503,22 @@ T_MANUAL, "K T_HOMEPAGE, "Honlap", T_CALIBRATION, "Kalibrci", T_MAILTO_PROG, "Levelez program (% helyre rd be a cmed)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet program (% helyre rd be \'kiszolgl\' vagy \'kiszolgl port\')", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 program (% helyre rd be \'kiszolgl\' vagy \'kiszolgl port\')", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Levelez s Telnet programok", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nincs program", T_NO_PROGRAM_SPECIFIED_FOR, "Nincs program belltva", T_MAIL, "levelezs", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Hibs levlkldsi URL", T_BAD_TELNET_URL, "Hibs telnet URL", T_BAD_TN3270_URL, "Hibs tn3270 URL", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/icelandic.lng b/intl/icelandic.lng index d898c5c..06ea1b2 100644 --- a/intl/icelandic.lng +++ b/intl/icelandic.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Tala ekki T_BAD_STRING, "gildur strengur", T_EMPTY_STRING_NOT_ALLOWED, "Tmur strengur heimill", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Uppsetningarvilla", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Villa vi ritun uppsetningarskrr", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Tengingar", T_MAX_CONNECTIONS, "Hmark tenginga", T_MAX_CONNECTIONS_TO_ONE_HOST, "Hmark tenginga vi hvern milara", @@ -502,20 +503,22 @@ T_MANUAL, "Handb T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Pstforrit (% er skipt t fyrir netfang)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet forrit (% er skipt t fyrir \"milari\" ea \"milari gtt\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 forrit (% er skipt t fyrir \"milari\" ea \"milari gtt\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Pst- og telnet forrit", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Ekkert forrit", T_NO_PROGRAM_SPECIFIED_FOR, "Ekkert forrit skilgreint fyrir", T_MAIL, "pstur", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Rangt pstfang", T_BAD_TELNET_URL, "Rangt netfang", T_BAD_TN3270_URL, "Rangt netfang", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/italian.lng b/intl/italian.lng index 2f1bf77..3a5913f 100644 --- a/intl/italian.lng +++ b/intl/italian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Numero fuori intervallo", T_BAD_STRING, "Stringa sbagliata", T_EMPTY_STRING_NOT_ALLOWED, "Stringa vuota non consentita", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Errore configurazione", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Non posso scrivere il file di configurazione", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Connessioni", T_MAX_CONNECTIONS, "Connessioni massime", T_MAX_CONNECTIONS_TO_ONE_HOST, "Connessioni massime ad un host", @@ -502,20 +503,22 @@ T_MANUAL, "Manuale utente", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Programma mail (% e' sostituito con l'indirizzo)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Programma telnet (% e' sostituito con \"host\" o \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Programma Tn3270 (% e' sostituito con \"host\" o \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Programmi mail e telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nessun programma", T_NO_PROGRAM_SPECIFIED_FOR, "Nessun programma definito per", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Errato mailto url", T_BAD_TELNET_URL, "Errato telnet url", T_BAD_TN3270_URL, "Errato tn3270 url", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/lithuanian.lng b/intl/lithuanian.lng index aebf162..d23fe7e 100644 --- a/intl/lithuanian.lng +++ b/intl/lithuanian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Skai T_BAD_STRING, "Neteisinga eilut", T_EMPTY_STRING_NOT_ALLOWED, "Eilut negali bti tuia", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Configravimo klaida", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nemanoma rayti konfigracijos fail", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Prisijungimai", T_MAX_CONNECTIONS, "Daugiausia prisijungim", T_MAX_CONNECTIONS_TO_ONE_HOST, "Daugiausia prisijungim t pat host", @@ -502,20 +503,22 @@ T_MANUAL, "Vartotojo gidas", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Pato programa (% pakeiiamas adresu)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnet'o programa (% pakeiiamas \"hostu\" arba \"hostu prievadu\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270 programa (% pakeiiamas \"hostu\" arba \"hostu prievadu\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Pato ir telnet'o programos", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nr programos", T_NO_PROGRAM_SPECIFIED_FOR, "Nr programos", T_MAIL, "patui", T_TELNET, "telnet'ui", -T_MAGNET, NULL, T_TN3270, "tn3270'ui", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Blogas pato adresas", T_BAD_TELNET_URL, "Blogas telnet'o adresas", T_BAD_TN3270_URL, "Blogas tn3270 adresas", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/norwegian.lng b/intl/norwegian.lng index 4bbd75b..78e2071 100644 --- a/intl/norwegian.lng +++ b/intl/norwegian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Nummeret er utenfor omr T_BAD_STRING, "Feil i tekststreng", T_EMPTY_STRING_NOT_ALLOWED, "Tom tekststreng er ikke tillatt", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfigurasjonsfeil", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Kan ikke skrive til konfigurasjonsfil", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Tilkoblinger", T_MAX_CONNECTIONS, "Maks antall tilkoblinger", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maks antall tilkoblinger per vert", @@ -502,20 +503,22 @@ T_MANUAL, "Brukerveiledning", T_HOMEPAGE, "Hjemmeside", T_CALIBRATION, "Kalibrering", T_MAILTO_PROG, "E-brevklient (% erstattes med adresse)", -T_SHELL_PROG, "Skall", T_TELNET_PROG, "Telnetklient (% erstattes med \"vert\" eller \"vert port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270-program (% erstattes med \"vert\" eller \"vert port\")", T_MMS_PROG, "MMS-program (% erstattes med nettadresse)", +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Skall", T_MAIL_AND_TELNET_PROGRAMS, "Program for e-brev og fjerninnlogging", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Program for e-brev, fjerninnlogging og skall", T_NO_PROGRAM, "Ingen program", T_NO_PROGRAM_SPECIFIED_FOR, "Ingen program er spesifisert", T_MAIL, "e-brev", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Feil i \"mailto\"-adresse", T_BAD_TELNET_URL, "Feil i \"telnet\"-adresse", T_BAD_TN3270_URL, "Feil i \"tn3270\"-adresse", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/polish.lng b/intl/polish.lng index 9ee437b..14a851b 100644 --- a/intl/polish.lng +++ b/intl/polish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Liczba poza dozwolonym zakresem", T_BAD_STRING, "Nieprawidowe wyraenie", T_EMPTY_STRING_NOT_ALLOWED, "Musisz wpisa jakie wyraenie", T_BAD_IP_ADDRESS, "Bdny adres IP", -T_INVALID_IP_ADDRESS_SYNTAX, "Bdna skadnia adresu IP", T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Nie mona uy lokalnego adresu IP", T_CONFIG_ERROR, "Bd konfiguracji", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nie mona zapisa do pliku konfiguracyjnego", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, "Plik nie istnieje", T_THE_FILE_HAS_INVALID_FORMAT, "Plik ma bdny format", T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Poczenia", T_MAX_CONNECTIONS, "Maksymalna liczba pocze", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksymalna liczba pocze z jednym serwerem", @@ -502,20 +503,22 @@ T_MANUAL, "Podr T_HOMEPAGE, "Strona domowa", T_CALIBRATION, "Kalibracja", T_MAILTO_PROG, "Program pocztowy (% jest zastpowany przez adres e-mail)", -T_SHELL_PROG, "Program powoki", T_TELNET_PROG, "Program usugi Telnet (% jest zastpowany przez \"host\" lub przez \"host port\")", -T_MAGNET_PROG, "Program Magnet (% jest zastpowany przez URL)", T_TN3270_PROG, "Program Tn3270 (% jest zastpowany przez \"host\" lub przez \"host port\")", T_MMS_PROG, "Program MMS (% jest zastpowany przez URL)", +T_MAGNET_PROG, "Program Magnet (% jest zastpowany przez URL)", +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Program powoki", T_MAIL_AND_TELNET_PROGRAMS, "Obsuga poczty i usugi Telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Obsuga poczty, usugi Telnet i powoki", T_NO_PROGRAM, "Nie okrelono programu", T_NO_PROGRAM_SPECIFIED_FOR, "Nie okrelono programu do obsugi", T_MAIL, "poczty", T_TELNET, "telneta", -T_MAGNET, "magneta", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "magneta", +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Bdny adres e-mail", T_BAD_TELNET_URL, "Niewaciwy adres serwera dla programu Telnet", T_BAD_TN3270_URL, "Niewaciwy adres serwera dla programu Tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, "C", T_HK_IPV6_OPTIONS, "I", T_HK_PROXIES, "P", T_HK_SSL_OPTIONS, "L", +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, "H", T_HK_FTP_OPTIONS, "F", T_HK_SMB_OPTIONS, "S", diff --git a/intl/portuguese.lng b/intl/portuguese.lng index eeea991..c5df81d 100644 --- a/intl/portuguese.lng +++ b/intl/portuguese.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "N T_BAD_STRING, "Sequncia de caracteres invlida", T_EMPTY_STRING_NOT_ALLOWED, "No permitida uma sequncia de caracteres vazia", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Erro de configurao", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "No posso escrever no arquivo de configurao", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Conexes", T_MAX_CONNECTIONS, NULL, T_MAX_CONNECTIONS_TO_ONE_HOST, NULL, @@ -502,20 +503,22 @@ T_MANUAL, "Manual do Utilizador", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, NULL, -T_SHELL_PROG, NULL, T_TELNET_PROG, NULL, -T_MAGNET_PROG, NULL, T_TN3270_PROG, NULL, T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, NULL, T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nenhum programa", T_NO_PROGRAM_SPECIFIED_FOR, "Nenhum programa foi especificado para", T_MAIL, NULL, T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, NULL, T_BAD_TELNET_URL, NULL, T_BAD_TN3270_URL, NULL, @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/romanian.lng b/intl/romanian.lng index 26e4b76..ea6415e 100644 --- a/intl/romanian.lng +++ b/intl/romanian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Num T_BAD_STRING, "ir greit", T_EMPTY_STRING_NOT_ALLOWED, "ir vid neacceptabil", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Eroare de configurare", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nu pot s scriu fiierul de configurere", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Conexiuni", T_MAX_CONNECTIONS, "Conexiuni maxime", T_MAX_CONNECTIONS_TO_ONE_HOST, "Conexiuni maxime la un host", @@ -502,20 +503,22 @@ T_MANUAL, "Manualul utilizatorului", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Program de e-mail (% este nlocuit cu adresa)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Program de telnet (% este nlocuit cu \"Host\" ori \"Host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Program de Tn3270 (% este nlocuit cu \"Host\" ori \"Host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Programe de e-mail si telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Nici un program", T_NO_PROGRAM_SPECIFIED_FOR, "Program nespecificat pentru", T_MAIL, "E-mail", T_TELNET, "Telnet", -T_MAGNET, NULL, T_TN3270, "Tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "URL greit pentru e-mail", T_BAD_TELNET_URL, "URL greit pentru telnet", T_BAD_TN3270_URL, "URL greit pentru tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/russian.lng b/intl/russian.lng index 6496c69..731efa6 100644 --- a/intl/russian.lng +++ b/intl/russian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, " ", T_EMPTY_STRING_NOT_ALLOWED, " ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " ", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "()", T_MAX_CONNECTIONS, ". ", T_MAX_CONNECTIONS_TO_ONE_HOST, ". ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, " ", T_CALIBRATION, "", T_MAILTO_PROG, " (% )", -T_SHELL_PROG, " (shell) (% )", T_TELNET_PROG, " telnet (% 'host' 'host port')", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " tn3270 (% 'host' 'host port')", T_MMS_PROG, " MMS- (% URL)", +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, " (shell) (% )", T_MAIL_AND_TELNET_PROGRAMS, " telnet'", T_MAIL_TELNET_AND_SHELL_PROGRAMS, " , telnet ", T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, " mailto:", T_BAD_TELNET_URL, " telnet", T_BAD_TN3270_URL, " tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/serbian.lng b/intl/serbian.lng index ba64905..29eb489 100644 --- a/intl/serbian.lng +++ b/intl/serbian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, " ", T_EMPTY_STRING_NOT_ALLOWED, " ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " ", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "", T_MAX_CONNECTIONS, " ", T_MAX_CONNECTIONS_TO_ONE_HOST, " ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, " ", T_CALIBRATION, "", T_MAILTO_PROG, " (% )", -T_SHELL_PROG, " ( % )", T_TELNET_PROG, " (% \"\" \" \")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " tn3270 (% \"\" \" \")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, " ( % )", T_MAIL_AND_TELNET_PROGRAMS, " ", T_MAIL_TELNET_AND_SHELL_PROGRAMS, " , ", T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, "", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, " mailto ", T_BAD_TELNET_URL, " telnet ", T_BAD_TN3270_URL, " tn3270 ", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/slovak.lng b/intl/slovak.lng index 50f84d2..81ad064 100644 --- a/intl/slovak.lng +++ b/intl/slovak.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, "Chybn reazec", T_EMPTY_STRING_NOT_ALLOWED, "Przdny reazec nie je dovolen!", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Chyba v konfigurcii", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Nemem zapisova do konfig. sboru", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Spojenie", T_MAX_CONNECTIONS, "Maximlny poet spojen", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maximlny poet spojen na jeden pota", @@ -502,20 +503,22 @@ T_MANUAL, "Manu T_HOMEPAGE, "Domovsk strnka", T_CALIBRATION, "Kalibrcia", T_MAILTO_PROG, "Program pre mail (% je nahradene adresou)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Program pre telnet (% je nahradene menom stroje a prpadne portom)", -T_MAGNET_PROG, "Program pre magnet (% je nahradene URL)", T_TN3270_PROG, "Program pre tn3270 (% je je nahradene menom stroje a prpadne portom)", T_MMS_PROG, "Program pre mms (% je nahradene URL)",, +T_MAGNET_PROG, "Program pre magnet (% je nahradene URL)", +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Programy pre mail a telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Programy pre mail a telnet a shell", T_NO_PROGRAM, "iadny program", T_NO_PROGRAM_SPECIFIED_FOR, "Nie je nastaven iadny program pre", T_MAIL, "mail", T_TELNET, "telnet", -T_MAGNET, "magnet", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "magnet", +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Chybn mailov URL", T_BAD_TELNET_URL, " Chybn terminlove URL (telnet)", T_BAD_TN3270_URL, " Chybn terminlove URL (tn3270)", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/spanish.lng b/intl/spanish.lng index fea1be1..afe1bbd 100644 --- a/intl/spanish.lng +++ b/intl/spanish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "N T_BAD_STRING, "Cadena incorrecta", T_EMPTY_STRING_NOT_ALLOWED, "No se permite cadena vaca", T_BAD_IP_ADDRESS, "Direccin IP incorrecta", -T_INVALID_IP_ADDRESS_SYNTAX, "Sintxis de direccin IP no vlida", T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Imposible usar direccin IP local", T_CONFIG_ERROR, "Error de configuracin", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Imposible escribir en archivo de configuracin", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, "Archivo no encontrado", T_THE_FILE_HAS_INVALID_FORMAT, "Archivo con formato no vlido", T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, "Error al inicializar los certificados incorporados", T_FAILED, "Ha fallado", +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Conexiones", T_MAX_CONNECTIONS, "Mximo de conexiones", T_MAX_CONNECTIONS_TO_ONE_HOST, "Mximo de conexiones a una mquina", @@ -502,20 +503,22 @@ T_MANUAL, "Manual de usuario", T_HOMEPAGE, "Pgina de inicio", T_CALIBRATION, "Calibracin", T_MAILTO_PROG, "Programa de correo (% se reemplaza por la direccin)", -T_SHELL_PROG, "Programa shell para ejecutar comandos externos (% se reemplaza por el comando)", T_TELNET_PROG, "Programa de telnet (% se reemplaza por \"mquina\" o \"mquina puerto\")", -T_MAGNET_PROG, "Programa magnet (% se reemplaza con URL)", T_TN3270_PROG, "Programa Tn3270 (% se reemplaza con \"mquina\" o \"mquina puerto\")", T_MMS_PROG, "Programa MMS (% se reemplaza con URL)", +T_MAGNET_PROG, "Programa magnet (% se reemplaza con URL)", +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Programa shell para ejecutar comandos externos (% se reemplaza por el comando)", T_MAIL_AND_TELNET_PROGRAMS, "Programas de correo y telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Programas de correo, telnet y shell", T_NO_PROGRAM, "Sin programa", T_NO_PROGRAM_SPECIFIED_FOR, "Sin programa especificado para", T_MAIL, "correo", T_TELNET, "telnet", -T_MAGNET, "magnet", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "magnet", +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Direccin de correo incorrecta", T_BAD_TELNET_URL, "URL de telnet incorrecta", T_BAD_TN3270_URL, "URL de TN3270 incorrecta", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/swedish.lng b/intl/swedish.lng index 3eebce4..3d1e8d9 100644 --- a/intl/swedish.lng +++ b/intl/swedish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Nummer i felaktigt intervall", T_BAD_STRING, "Felaktig strng", T_EMPTY_STRING_NOT_ALLOWED, "Tom strng ej tillten", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfigurationsfel", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Kan inte skriva till konfigurationsfilen", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "uppkopplingar", T_MAX_CONNECTIONS, "Max anslutningar", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max anslutningar till vrd", @@ -502,20 +503,22 @@ T_MANUAL, "Bruksanvisning", T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, "Epostprogram (% erstts med adress)", -T_SHELL_PROG, NULL, T_TELNET_PROG, "Telnetprogram (% erstts med \"vrd\" eller \"vrd port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Tn3270-program (% erstts med \"vrd\" eller \"vrd port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, "Epost- och telnetprogram", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, "Inget program", T_NO_PROGRAM_SPECIFIED_FOR, "Inget program angett fr", T_MAIL, "epost", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, "tn3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Felaktig mailto-URL", T_BAD_TELNET_URL, "Felaktig telnet-URL", T_BAD_TN3270_URL, "Felaktig tn3270-URL", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/swiss_german.lng b/intl/swiss_german.lng index 60710fa..74dd31a 100644 --- a/intl/swiss_german.lng +++ b/intl/swiss_german.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Ung T_BAD_STRING, "Falschi Igabe", T_EMPTY_STRING_NOT_ALLOWED, "Werte Igabe erforderlich", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Konfigurationsfehler", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Cha Konfigurationsdatei nd schriebe", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Verbindige", T_MAX_CONNECTIONS, "Max. Verbindige", T_MAX_CONNECTIONS_TO_ONE_HOST, "Max. Verbindige zumene Server", @@ -219,7 +220,7 @@ T_FRAME_AT_FULL_SCREEN, "Rahme im Vollbildschirm", T_SAVE_CLIPBOARD_TO_A_FILE, NULL, T_LOAD_CLIPBOARD_FROM_A_FILE, NULL, T_THE_CLIPBOARD_IS_EMPTY, NULL, -T_SAVE_HTML_OPTIONS, "HTML Sicherheit", +T_SAVE_HTML_OPTIONS, "Speichere HTML Optionen", T_CHARACTER_SET, "Zeichesatz", T_DEFAULT_CHARSET, NULL, T_CACHE, "Cache", @@ -502,20 +503,22 @@ T_MANUAL, "Manual", T_HOMEPAGE, "Homepage", T_CALIBRATION, "Kalibration", T_MAILTO_PROG, "Mail-Programm (% wird mit Email-Addresse ersetzt)", -T_SHELL_PROG, "Shell-Programm fr externi Ufref (% wird mit Kommando ersetzt)", T_TELNET_PROG, "Telnet-Programm (% wird mit \"host\" oder \"host port\" ersetzt)", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "TN3270-Programm (% wird mit \"host\" oder \"host port\" ersetzt)", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Shell-Programm fr externi Ufref (% wird mit Kommando ersetzt)", T_MAIL_AND_TELNET_PROGRAMS, "Mail-/Telnet-Programme", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Mail-/Telnet-/Shell-Programme", T_NO_PROGRAM, "Keis Programm", T_NO_PROGRAM_SPECIFIED_FOR, "Programm nd definiert fr ", T_MAIL, "Mail", T_TELNET, "Telnet", -T_MAGNET, NULL, T_TN3270, "TN3270", T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "fehlerhafti Mailadresse", T_BAD_TELNET_URL, "fehlerhafti Telnetadresse", T_BAD_TN3270_URL, "fehlerhafti TN3270-Adresse", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/turkish.lng b/intl/turkish.lng index 5008a82..3daacab 100644 --- a/intl/turkish.lng +++ b/intl/turkish.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Say T_BAD_STRING, "Hatal dizi", T_EMPTY_STRING_NOT_ALLOWED, "Bo diziye izin verilmiyor", T_BAD_IP_ADDRESS, "Hatal IP adresi", -T_INVALID_IP_ADDRESS_SYNTAX, "Geersiz IP adresi szdizimi", T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, "Yerel IP adresi kullanlamyor", T_CONFIG_ERROR, "Yaplandrma hatas", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Yaplandrma dosyasna yazlamyor", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, "Dosya mevcut de T_THE_FILE_HAS_INVALID_FORMAT, "Dosya biimi geersiz", T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, "Gml sertifikalar kullanlrken hata", T_FAILED, "baarsz oldu", +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "Balantlar", T_MAX_CONNECTIONS, "En ok balant", T_MAX_CONNECTIONS_TO_ONE_HOST, "Bir makineye en ok balant", @@ -502,20 +503,22 @@ T_MANUAL, "Kullan T_HOMEPAGE, "Ana sayfa", T_CALIBRATION, "Kalibrasyon", T_MAILTO_PROG, "Posta program (% adres ile deitirilir)", -T_SHELL_PROG, "D komutlar altrmak iin kabuk (% kabuk ile deitirilir)", T_TELNET_PROG, "Telnet program (% \"makine\" veya \"makine kaps\" ile deitirilir)", -T_MAGNET_PROG, "Mknats program (% URL ile deitirilir)", T_TN3270_PROG, "Tn3270 program (% \"makine\" veya \"makine kaps\" ile deitirilir)", T_MMS_PROG, "MMS program (% URL ile deitirilir)", +T_MAGNET_PROG, "Mknats program (% URL ile deitirilir)", +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "D komutlar altrmak iin kabuk (% kabuk ile deitirilir)", T_MAIL_AND_TELNET_PROGRAMS, "Posta ve Telnet Programlar", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Posta, Telnet ve kabuk Programlar", T_NO_PROGRAM, "Program yok", T_NO_PROGRAM_SPECIFIED_FOR, "Program belirlenmemi:", T_MAIL, "posta", T_TELNET, "telnet", -T_MAGNET, "mknats", T_TN3270, "tn3270", T_MMS, "mms", +T_MAGNET, "mknats", +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Adrese posta gnder", T_BAD_TELNET_URL, "Hatal Telnet adresi", T_BAD_TN3270_URL, "Hatal tn3270 adresi", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, "R", T_HK_IPV6_OPTIONS, "6", T_HK_PROXIES, "V", T_HK_SSL_OPTIONS, "S", +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, "H", T_HK_FTP_OPTIONS, "F", T_HK_SMB_OPTIONS, "S", diff --git a/intl/ukrainian.lng b/intl/ukrainian.lng index 3f4f437..6bb08f0 100644 --- a/intl/ukrainian.lng +++ b/intl/ukrainian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, " T_BAD_STRING, " ", T_EMPTY_STRING_NOT_ALLOWED, "Φ ͦ", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, " Ʀæ", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, " Ʀæ", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "'", T_MAX_CONNECTIONS, ". '", T_MAX_CONNECTIONS_TO_ONE_HOST, ". ' ", @@ -502,20 +503,22 @@ T_MANUAL, " T_HOMEPAGE, NULL, T_CALIBRATION, NULL, T_MAILTO_PROG, " (% ͦ )", -T_SHELL_PROG, NULL, T_TELNET_PROG, " telnet (% ͦ 'host' 'host port')", -T_MAGNET_PROG, NULL, T_TN3270_PROG, " tn3270 (% ͦ 'host' 'host port')", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, NULL, T_MAIL_AND_TELNET_PROGRAMS, " telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, NULL, T_NO_PROGRAM, " ", T_NO_PROGRAM_SPECIFIED_FOR, " ", T_MAIL, "", T_TELNET, NULL, -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, " mailto:", T_BAD_TELNET_URL, " telnet", T_BAD_TN3270_URL, " tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/intl/upper_sorbian.lng b/intl/upper_sorbian.lng index a871fbe..87c16fd 100644 --- a/intl/upper_sorbian.lng +++ b/intl/upper_sorbian.lng @@ -11,7 +11,6 @@ T_NUMBER_OUT_OF_RANGE, "Li T_BAD_STRING, "Njekorektny wuraz", T_EMPTY_STRING_NOT_ALLOWED, "Nulowy wuraz njedowoleny", T_BAD_IP_ADDRESS, NULL, -T_INVALID_IP_ADDRESS_SYNTAX, NULL, T_UNABLE_TO_USE_LOCAL_IP_ADDRESS, NULL, T_CONFIG_ERROR, "Zmylk konfiguracije", T_UNABLE_TO_WRITE_TO_CONFIG_FILE, "Njemu do konfiguraciskeje dataje pisa", @@ -141,6 +140,8 @@ T_THE_FILE_DOES_NOT_EXIST, NULL, T_THE_FILE_HAS_INVALID_FORMAT, NULL, T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES, NULL, T_FAILED, NULL, +T_DNS_OPTIONS, NULL, +T_DNS_OVER_HTTPS_URL, NULL, T_CONNECTIONS, "zwiskow", T_MAX_CONNECTIONS, "Maksimalna liba zwiskow", T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksimalna liba zwiskow z jednym serwerom", @@ -502,20 +503,22 @@ T_MANUAL, "P T_HOMEPAGE, "Domjaca strona", T_CALIBRATION, "Kalibracija", T_MAILTO_PROG, "Emailowy program (% so z emailowej adresu naruna)", -T_SHELL_PROG, "Programowy interpreter (% so naruna z pikazom)", T_TELNET_PROG, "Program za telnet (% naruna so z \"host\" abo \"host port\")", -T_MAGNET_PROG, NULL, T_TN3270_PROG, "Program za Tn3270 (% naruna so z \"host\" abo \"host port\")", T_MMS_PROG, NULL, +T_MAGNET_PROG, NULL, +T_GOPHER_PROG, NULL, +T_SHELL_PROG, "Programowy interpreter (% so naruna z pikazom)", T_MAIL_AND_TELNET_PROGRAMS, "Elektroniska pta a telnet", T_MAIL_TELNET_AND_SHELL_PROGRAMS, "Programy za elektronisku ptu, telnet a komanda", T_NO_PROGRAM, "adyn program", T_NO_PROGRAM_SPECIFIED_FOR, "adyn program podaty za", T_MAIL, "email", T_TELNET, "telnet", -T_MAGNET, NULL, T_TN3270, NULL, T_MMS, NULL, +T_MAGNET, NULL, +T_GOPHER, NULL, T_BAD_MAILTO_URL, "Hubjena emailowa adresa", T_BAD_TELNET_URL, "Hubjena adresa serwera za telnet", T_BAD_TN3270_URL, "Hubjena adresa serwera za Tn3270", @@ -668,6 +671,7 @@ T_HK_CONNECTIONS, NULL, T_HK_IPV6_OPTIONS, NULL, T_HK_PROXIES, NULL, T_HK_SSL_OPTIONS, NULL, +T_HK_DNS_OPTIONS, NULL, T_HK_HTTP_OPTIONS, NULL, T_HK_FTP_OPTIONS, NULL, T_HK_SMB_OPTIONS, NULL, diff --git a/language.h b/language.h index 069fd70..0f01be6 100644 --- a/language.h +++ b/language.h @@ -15,709 +15,713 @@ #define T_BAD_STRING 10 #define T_EMPTY_STRING_NOT_ALLOWED 11 #define T_BAD_IP_ADDRESS 12 -#define T_INVALID_IP_ADDRESS_SYNTAX 13 -#define T_UNABLE_TO_USE_LOCAL_IP_ADDRESS 14 -#define T_CONFIG_ERROR 15 -#define T_UNABLE_TO_WRITE_TO_CONFIG_FILE 16 -#define T_HOME_DIRECTORY_INACCESSIBLE 17 -#define T_BOOKMARK_ERROR 18 -#define T_UNABLE_TO_WRITE_TO_BOOKMARK_FILE 19 -#define T_ABOUT 20 -#define T_LINKS__LYNX_LIKE 21 -#define T_VERSION 22 -#define T_VERSION_INFORMATION 23 -#define T_LINKS_VERSION 24 -#define T_OPERATING_SYSTEM_TYPE 25 -#define T_OPERATING_SYSTEM_VERSION 26 -#define T_COMPILER 27 -#define T_WORD_SIZE 28 -#define T_MEMORY 29 -#define T_FILE_SIZE 30 -#define T_DEBUGGING_LEVEL 31 -#define T_EVENT_HANDLER 32 -#define T_SELECT_SYSCALL 33 -#define T_dISABLED 34 -#define T_IPV6 35 -#define T_NOT_ENABLED_IN_SYSTEM 36 -#define T_LOCAL_NETWORK_ONLY 37 -#define T_UTF8_TERMINAL 38 -#define T_COMPRESSION_METHODS 39 -#define T_ENCRYPTION 40 -#define T_NO_CERTIFICATE_VERIFICATION 41 -#define T_GPM_MOUSE_DRIVER 42 -#define T_XTERM_FOR_OS2 43 -#define T_GRAPHICS_MODE 44 -#define T_IMAGE_LIBRARIES 45 -#define T_FONT_RENDERING 46 -#define T_INTERNAL 47 -#define T_OPENMP 48 -#define T_NOT_USED_IN_TEXT_MODE 49 -#define T_DISABLED 50 -#define T_THREAD 51 -#define T_THREADS 52 -#define T_THREADS5 53 -#define T_CONFIGURATION_DIRECTORY 54 -#define T_NONE 55 -#define T_KEYS 56 -#define T_KEYS_DESC 57 -#define T_KEYS_BRAILLE_DESC 58 -#define T_COPYING 59 -#define T_COPYING_DESC 60 -#define T_RESOURCES 61 -#define T_MEMORY_CACHE 62 -#define T_DECOMPRESSED_CACHE 63 -#define T_FONT_CACHE 64 -#define T_IMAGE_CACHE 65 -#define T_FORMATTED_DOCUMENT_CACHE 66 -#define T_DNS_CACHE 67 -#define T_TLS_SESSION_CACHE 68 -#define T_HANDLES 69 -#define T_TIMERS 70 -#define T_WAITING 71 -#define T_CONNECTING 72 -#define T_tRANSFERRING 73 -#define T_KEEPALIVE 74 -#define T_BYTES 75 -#define T_LETTERS 76 -#define T_FILES 77 -#define T_LOCKED 78 -#define T_LOADING 79 -#define T_IMAGES 80 -#define T_DOCUMENTS 81 -#define T_SERVERS 82 -#define T_MEMORY_ALLOCATED 83 -#define T_BLOCKS_ALLOCATED 84 -#define T_MEMORY_LARGE_BLOCKS 85 -#define T_BLOCKS_LARGE_BLOCKS 86 -#define T_MEMORY_REQUESTED 87 -#define T_BLOCKS_REQUESTED 88 -#define T_JS_MEMORY_ALLOCATED 89 -#define T_MEMORY_INFO 90 -#define T_MOST_ALLOCATED 91 -#define T_LARGEST_BLOCKS 92 -#define T_NO_HISTORY 93 -#define T_NO_DOWNLOADS 94 -#define T_NO_FRAMES 95 -#define T_VT_100_FRAMES 96 -#define T_LINUX_OR_OS2_FRAMES 97 -#define T_KOI8R_FRAMES 98 -#define T_FREEBSD_FRAMES 99 -#define T_UTF8_FRAMES 100 -#define T_USE_11M 101 -#define T_RESTRICT_FRAMES_IN_CP850_852 102 -#define T_BLOCK_CURSOR 103 -#define T_COLOR 104 -#define T_BRAILLE_TERMINAL 105 -#define T_TERMINAL_OPTIONS 106 -#define T_SCREEN_MARGINS 107 -#define T_LEFT_MARGIN 108 -#define T_RIGHT_MARGIN 109 -#define T_TOP_MARGIN 110 -#define T_BOTTOM_MARGIN 111 -#define T_MARGINS_TOO_LARGE 112 -#define T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN 113 -#define T_NETWORK_OPTIONS 114 -#define T_IPV6_OPTIONS 115 -#define T_IPV6_DEFAULT 116 -#define T_IPV6_PREFER_IPV4 117 -#define T_IPV6_PREFER_IPV6 118 -#define T_IPV6_USE_ONLY_IPV4 119 -#define T_IPV6_USE_ONLY_IPV6 120 -#define T_PROXIES 121 -#define T_HTTP_PROXY__HOST_PORT 122 -#define T_FTP_PROXY__HOST_PORT 123 -#define T_HTTPS_PROXY__HOST_PORT 124 -#define T_SOCKS_4A_PROXY__USER_HOST_PORT 125 -#define T_APPEND_TEXT_TO_SOCKS_LOOKUPS 126 -#define T_NOPROXY_LIST 127 -#define T_ONLY_PROXIES 128 -#define T_TOR_MODE_ENABLED 129 -#define T_SSL_OPTIONS 130 -#define T_ACCEPT_INVALID_CERTIFICATES 131 -#define T_WARN_ON_INVALID_CERTIFICATES 132 -#define T_REJECT_INVALID_CERTIFICATES 133 -#define T_USE_BUILT_IN_CERTIFICATES 134 -#define T_CLIENT_CERTIFICATE_KEY_FILE 135 -#define T_CLIENT_CERTIFICATE_FILE 136 -#define T_CLIENT_CERTIFICATE_KEY_PASSWORD 137 -#define T_BAD_FILE 138 -#define T_THE_FILE_DOES_NOT_EXIST 139 -#define T_THE_FILE_HAS_INVALID_FORMAT 140 -#define T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES 141 -#define T_FAILED 142 -#define T_CONNECTIONS 143 -#define T_MAX_CONNECTIONS 144 -#define T_MAX_CONNECTIONS_TO_ONE_HOST 145 -#define T_RETRIES 146 -#define T_RECEIVE_TIMEOUT_SEC 147 -#define T_TIMEOUT_WHEN_UNRESTARTABLE 148 -#define T_TIMEOUT_WHEN_TRYING_MULTIPLE_ADDRESSES 149 -#define T_TIMEOUT_WHEN_TRYING_KEEPALIVE_CONNECTION 150 -#define T_BIND_TO_LOCAL_IP_ADDRESS 151 -#define T_BIND_TO_LOCAL_IPV6_ADDRESS 152 -#define T_ASYNC_DNS_LOOKUP 153 -#define T_SET_TIME_OF_DOWNLOADED_FILES 154 -#define T_CACHE_OPTIONS 155 -#define T_MEMORY_CACHE_SIZE__KB 156 -#define T_IMAGE_CACHE_SIZE__KB 157 -#define T_FONT_CACHE_SIZE__KB 158 -#define T_NUMBER_OF_FORMATTED_DOCUMENTS 159 -#define T_AGGRESSIVE_CACHE 160 -#define T_HTML_OPTIONS 161 -#define T_DISPLAY_TABLES 162 -#define T_DISPLAY_FRAMES 163 -#define T_BREAK_LONG_LINES 164 -#define T_DISPLAY_IMAGES 165 -#define T_DISPLAY_IMAGE_FILENAMES 166 -#define T_DISPLAY_LINKS_TO_IMAGES 167 -#define T_LINK_ORDER_BY_COLUMNS 168 -#define T_NUMBERED_LINKS 169 -#define T_AUTO_REFRESH 170 -#define T_TARGET_IN_NEW_WINDOW 171 -#define T_TEXT_MARGIN 172 -#define T_DEFAULT_CODEPAGE 173 -#define T_IGNORE_CHARSET_INFO_SENT_BY_SERVER 174 -#define T_TEXT_COLOR 175 -#define T_LINK_COLOR 176 -#define T_BACKGROUND_COLOR 177 -#define T_IGNORE_DOCUMENT_COLOR 178 -#define T_COLOR_0 179 -#define T_COLOR_1 180 -#define T_COLOR_2 181 -#define T_COLOR_3 182 -#define T_COLOR_4 183 -#define T_COLOR_5 184 -#define T_COLOR_6 185 -#define T_COLOR_7 186 -#define T_COLOR_8 187 -#define T_COLOR_9 188 -#define T_COLOR_10 189 -#define T_COLOR_11 190 -#define T_COLOR_12 191 -#define T_COLOR_13 192 -#define T_COLOR_14 193 -#define T_COLOR_15 194 -#define T_GOTO_URL 195 -#define T_GO_BACK 196 -#define T_GO_FORWARD 197 -#define T_HISTORY 198 -#define T_RELOAD 199 -#define T_NEW_WINDOW 200 -#define T_SAVE_AS 201 -#define T_SAVE_URL_AS 202 -#define T_SAVE_FORMATTED_DOCUMENT 203 -#define T_COPY_URL_LOCATION 204 -#define T_KILL_BACKGROUND_CONNECTIONS 205 -#define T_KILL_ALL_CONNECTIONS 206 -#define T_FLUSH_ALL_CACHES 207 -#define T_RESOURCE_INFO 208 -#define T_OS_SHELL 209 -#define T_EXIT 210 -#define T_SEARCH 211 -#define T_SEARCH_BACK 212 -#define T_FIND_NEXT 213 -#define T_FIND_PREVIOUS 214 -#define T_TOGGLE_HTML_PLAIN 215 -#define T_DOCUMENT_INFO 216 -#define T_FRAME_AT_FULL_SCREEN 217 -#define T_SAVE_CLIPBOARD_TO_A_FILE 218 -#define T_LOAD_CLIPBOARD_FROM_A_FILE 219 -#define T_THE_CLIPBOARD_IS_EMPTY 220 -#define T_SAVE_HTML_OPTIONS 221 -#define T_CHARACTER_SET 222 -#define T_DEFAULT_CHARSET 223 -#define T_CACHE 224 -#define T_MAIL_AND_TELNEL 225 -#define T_MAIL_TELNET_AND_SHELL 226 -#define T_ASSOCIATIONS 227 -#define T_FILE_EXTENSIONS 228 -#define T_SAVE_OPTIONS 229 -#define T_FILE 230 -#define T_VIEW 231 -#define T_LINK 232 -#define T_DOWNLOADS 233 -#define T_WINDOWS 234 -#define T_SETUP 235 -#define T_HELP 236 -#define T_ENTER_URL 237 -#define T_SAVE_URL 238 -#define T_DOWNLOAD 239 -#define T_SAVE_TO_FILE 240 -#define T_SEARCH_FOR_TEXT 241 -#define T_PAGE_P 242 -#define T_PAGE_OF 243 -#define T_PAGE_CL 244 -#define T_FORMATTING_DOCUMENT 245 -#define T_SEARCHING 246 -#define T_WAITING_IN_QUEUE 247 -#define T_LOOKING_UP_HOST 248 -#define T_MAKING_CONNECTION 249 -#define T_MAKING_CONNECTION_TO_ANOTHER_ADDRESS 250 -#define T_SOCKS_NEGOTIATION 251 -#define T_SSL_NEGOTIATION 252 -#define T_REQUEST_SENT 253 -#define T_LOGGING_IN 254 -#define T_GETTING_HEADERS 255 -#define T_SERVER_IS_PROCESSING_REQUEST 256 -#define T_TRANSFERRING 257 -#define T_INTERRUPTED 258 -#define T_INTERNAL_ERROR 259 -#define T_OUT_OF_MEMORY 260 -#define T_HOST_NOT_FOUND 261 -#define T_PROXY_NOT_FOUND 262 -#define T_ERROR_WRITING_TO_SOCKET 263 -#define T_ERROR_READING_FROM_SOCKET 264 -#define T_DATA_MODIFIED 265 -#define T_BAD_URL_SYNTAX 266 -#define T_BAD_PROXY_SYNTAX 267 -#define T_RECEIVE_TIMEOUT 268 -#define T_REQUEST_MUST_BE_RESTARTED 269 -#define T_CANT_GET_SOCKET_STATE 270 -#define T_CYCLIC_REDIRECT 271 -#define T_TOO_LARGE_FILE 272 -#define T_BAD_HTTP_RESPONSE 273 -#define T_HTTP_100 274 -#define T_NO_CONTENT 275 -#define T_HTTPS_FWD_ERROR 276 -#define T_INVALID_CERTIFICATE 277 -#define T_DOWNGRADED_METHOD 278 -#define T_INSECURE_CIPHER 279 -#define T_UNKNOWN_FILE_TYPE 280 -#define T_ERROR_OPENING_FILE 281 -#define T_BAD_FTP_RESPONSE 282 -#define T_FTP_SERVICE_UNAVAILABLE 283 -#define T_BAD_FTP_LOGIN 284 -#define T_FTP_PORT_COMMAND_FAILED 285 -#define T_FILE_NOT_FOUND 286 -#define T_FTP_FILE_ERROR 287 -#define T_SSL_ERROR 288 -#define T_NO_SSL 289 -#define T_BAD_SOCKS_VERSION 290 -#define T_SOCKS_REJECTED_OR_FAILED 291 -#define T_SOCKS_NO_IDENTD 292 -#define T_SOCKS_BAD_USERID 293 -#define T_SOCKS_UNKNOWN_ERROR 294 -#define T_NO_SMB_CLIENT 295 -#define T_BLOCKED_URL 296 -#define T_SMB_NOT_ALLOWED 297 -#define T_FILE_NOT_ALLOWED 298 -#define T_NO_PROXY 299 -#define T_UNKNOWN_ERROR 300 -#define T_RECEIVED 301 -#define T_OF 302 -#define T_AVG 303 -#define T_CUR 304 -#define T_AVERAGE_SPEED 305 -#define T_SPEED 306 -#define T_CURRENT_SPEED 307 -#define T_ELAPSED_TIME 308 -#define T_ESTIMATED_TIME 309 -#define T_BACKGROUND 310 -#define T_ABORT 311 -#define T_ABORT_AND_DELETE_FILE 312 -#define T_YES 313 -#define T_NO 314 -#define T_NEVER 315 -#define T_DIRECTORY 316 -#define T_FILE_ALREADY_EXISTS 317 -#define T_ALREADY_EXISTS_AS_DOWNLOAD 318 -#define T_ALREADY_EXISTS 319 -#define T_DO_YOU_WISH_TO_CONTINUE 320 -#define T_DO_YOU_WISH_TO_OVERWRITE 321 -#define T_CONTINUE 322 -#define T_OVERWRITE 323 -#define T_RENAME 324 -#define T_DOWNLOAD_ERROR 325 -#define T_COULD_NOT_WRITE_TO_FILE 326 -#define T_ERROR_DOWNLOADING 327 -#define T_ERROR_LOADING 328 -#define T_COULD_NOT_CREATE_FILE 329 -#define T_COULD_NOT_CREATE_TEMPORARY_FILE 330 -#define T_ERROR_CALLING_LSEEK_ON_FILE 331 -#define T_TOO_LARGE_FILE_SEQUENCE 332 -#define T_UNKNOWN_TYPE 333 -#define T_CONTENT_TYPE_IS 334 -#define T_DO_YOU_WANT_TO_OPEN_SAVE_OR_DISPLAY_THIS_FILE 335 -#define T_DO_YOU_WANT_TO_OPEN_OR_DISPLAY_THIS_FILE 336 -#define T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE 337 -#define T_SAVE 338 -#define T_DISPLAY 339 -#define T_WHAT_TO_DO 340 -#define T_DO_YOU_WANT_TO_OPEN_FILE_WITH 341 -#define T_SAVE_IT_OR_DISPLAY_IT 342 -#define T_OPEN 343 -#define T_OPEN_WITH 344 -#define T_DO_YOU_WANT_TO_FOLLOW_REDIRECT_AND_POST_FORM_DATA_TO_URL 345 -#define T_DO_YOU_WANT_TO_POST_FORM_DATA_TO_URL 346 -#define T_DO_YOU_WANT_TO_REPOST_FORM_DATA_TO_URL 347 -#define T_WARNING 348 -#define T_ERROR 349 -#define T_WELCOME 350 -#define T_WELCOME_TO_LINKS 351 -#define T_BASIC_HELP 352 -#define T_LABEL 353 -#define T_CONTENT_TYPES 354 -#define T_PROGRAM__IS_REPLACED_WITH_FILE_NAME 355 -#define T_BLOCK_TERMINAL_WHILE_PROGRAM_RUNNING 356 -#define T_RUN_ON_TERMINAL 357 -#define T_RUN_IN_XWINDOW 358 -#define T_ASK_BEFORE_OPENING 359 -#define T_ACCEPT_HTTP 360 -#define T_ACCEPT_FTP 361 -#define T_DELETE_ASSOCIATION 362 -#define T_ASSOCIATION 363 -#define T_EXTENSION_S 364 -#define T_CONTENT_TYPE 365 -#define T_DELETE_EXTENSION 366 -#define T_EXTENSION 367 -#define T_eXTENSION 368 -#define T_ERROR_WHILE_POSTING_FORM 369 -#define T_COULD_NOT_GET_FILE 370 -#define T_READING_FILES_IS_NOT_ALLOWED 371 -#define T_NO_PREVIOUS_SEARCH 372 -#define T_SEARCH_STRING_NOT_FOUND 373 -#define T_SAVE_ERROR 374 -#define T_ERROR_WRITING_TO_FILE 375 -#define T_ERROR_READING_THE_FILE 376 -#define T_DISPLAY_USEMAP 377 -#define T_FOLLOW_LINK 378 -#define T_OPEN_IN_NEW_WINDOW 379 -#define T_DOWNLOAD_LINK 380 -#define T_RESET_FORM 381 -#define T_SUBMIT_FORM 382 -#define T_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW 383 -#define T_SUBMIT_FORM_AND_DOWNLOAD 384 -#define T_VIEW_IMAGE 385 -#define T_DOWNLOAD_IMAGE 386 -#define T_SCALE_IMAGE_TO_FULL_SCREEN 387 -#define T_NO_LINK_SELECTED 388 -#define T_IMAGE 389 -#define T_USEMAP 390 -#define T_XTERM 391 -#define T_TWTERM 392 -#define T_SCREEN 393 -#define T_WINDOW 394 -#define T_FULL_SCREEN 395 -#define T_BEOS_TERMINAL 396 -#define T_UNABLE_TO_OPEN_NEW_WINDOW 397 -#define T_JAVASCRIPT 398 -#define T_SUBMIT_FORM_TO 399 -#define T_POST_FORM_TO 400 -#define T_RADIO_BUTTON 401 -#define T_CHECKBOX 402 -#define T_SELECT_FIELD 403 -#define T_TEXT_FIELD 404 -#define T_TEXT_AREA 405 -#define T_FILE_UPLOAD 406 -#define T_PASSWORD_FIELD 407 -#define T_BUTTON 408 -#define T_NAME 409 -#define T_VALUE 410 -#define T_HIT_ENTER_TO 411 -#define T_SUBMIT_TO 412 -#define T_POST_TO 413 -#define T_INFO 414 -#define T_HEADER_INFO 415 -#define T_YOU_ARE_NOWHERE 416 -#define T_NO_HEADER 417 -#define T_URL 418 -#define T_IP_ADDRESS 419 -#define T_IP_ADDRESSES 420 -#define T_SIZE 421 -#define T_COMPRESSED_WITH 422 -#define T_INCOMPLETE 423 -#define T_CODEPAGE 424 -#define T_ASSUMED 425 -#define T_IGNORING_SERVER_SETTING 426 -#define T_SERVER 427 -#define T_DATE 428 -#define T_LAST_MODIFIED 429 -#define T_SSL_CIPHER 430 -#define T_CERTIFICATE_AUTHORITY 431 -#define T_CERTIFICATE_AUTHORITIES 432 -#define T_LANGUAGE 433 -#define T_DEFAULT_LANG 434 -#define T_GO_TO_LINK 435 -#define T_ENTER_LINK_NUMBER 436 -#define T_RESIZE_TERMINAL 437 -#define T_COLUMNS 438 -#define T_ROWS 439 -#define T_GOTO 440 -#define T_CLOSE 441 -#define T_FOLDER 442 -#define T_fOLDER 443 -#define T_ADD 444 -#define T_DELETE 445 -#define T_EDIT 446 -#define T_SELECT 447 -#define T_MOVE 448 -#define T_NO_ITEMS_SELECTED 449 -#define T_UNSELECT_ALL 450 -#define T_BOOKMARKS 451 -#define T_BOOKMARK 452 -#define T_ADD_BOOKMARK 453 -#define T_ADD_ASSOCIATION 454 -#define T_ADD_EXTENSION 455 -#define T_ADD_FOLDER 456 -#define T_BOOKMARK_TITLE 457 -#define T_EDIT_BOOKMARK 458 -#define T_EDIT_ASSOCIATION 459 -#define T_EDIT_EXTENSION 460 -#define T_DELETE_BOOKMARK 461 -#define T_EDIT_FOLDER 462 -#define T_DELETE_FOLDER 463 -#define T_NOT_EMPTY_SURE_DELETE 464 -#define T_BOOKMARK_MANAGER 465 -#define T_ASSOCIATIONS_MANAGER 466 -#define T_EXTENSIONS_MANAGER 467 -#define T_url 468 -#define T_NNAME 469 -#define T_EXIT_LINKS 470 -#define T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW 471 -#define T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS 472 -#define T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS 473 -#define T_HTTP_OPTIONS 474 -#define T_FTP_OPTIONS 475 -#define T_SMB_OPTIONS 476 -#define T_HTTP_BUG_WORKAROUNDS 477 -#define T_USE_HTTP_10 478 -#define T_ALLOW_SERVER_BLACKLIST 479 -#define T_DO_NOT_SEND_ACCEPT_CHARSET 480 -#define T_DO_NOT_ADVERTISE_COMPRESSION_SUPPORT 481 -#define T_RETRY_ON_INTERNAL_ERRORS 482 -#define T_HEADER_OPTIONS 483 -#define T_HTTP_HEADER_OPTIONS 484 -#define T_FAKE_FIREFOX 485 -#define T_DO_NOT_TRACK 486 -#define T_REFERER_NONE 487 -#define T_REFERER_SAME_URL 488 -#define T_REFERER_FAKE 489 -#define T_REFERER_REAL_SAME_SERVER 490 -#define T_REFERER_REAL 491 -#define T_FAKE_REFERER 492 -#define T_FAKE_USERAGENT 493 -#define T_EXTRA_HEADER 494 -#define T_PASSWORD_FOR_ANONYMOUS_LOGIN 495 -#define T_USE_PASSIVE_FTP 496 -#define T_USE_EPRT_EPSV 497 -#define T_SET_TYPE_OF_SERVICE 498 -#define T_ALLOW_HYPERLINKS_TO_SMB 499 -#define T_MANUAL 500 -#define T_HOMEPAGE 501 -#define T_CALIBRATION 502 -#define T_MAILTO_PROG 503 -#define T_SHELL_PROG 504 +#define T_UNABLE_TO_USE_LOCAL_IP_ADDRESS 13 +#define T_CONFIG_ERROR 14 +#define T_UNABLE_TO_WRITE_TO_CONFIG_FILE 15 +#define T_HOME_DIRECTORY_INACCESSIBLE 16 +#define T_BOOKMARK_ERROR 17 +#define T_UNABLE_TO_WRITE_TO_BOOKMARK_FILE 18 +#define T_ABOUT 19 +#define T_LINKS__LYNX_LIKE 20 +#define T_VERSION 21 +#define T_VERSION_INFORMATION 22 +#define T_LINKS_VERSION 23 +#define T_OPERATING_SYSTEM_TYPE 24 +#define T_OPERATING_SYSTEM_VERSION 25 +#define T_COMPILER 26 +#define T_WORD_SIZE 27 +#define T_MEMORY 28 +#define T_FILE_SIZE 29 +#define T_DEBUGGING_LEVEL 30 +#define T_EVENT_HANDLER 31 +#define T_SELECT_SYSCALL 32 +#define T_dISABLED 33 +#define T_IPV6 34 +#define T_NOT_ENABLED_IN_SYSTEM 35 +#define T_LOCAL_NETWORK_ONLY 36 +#define T_UTF8_TERMINAL 37 +#define T_COMPRESSION_METHODS 38 +#define T_ENCRYPTION 39 +#define T_NO_CERTIFICATE_VERIFICATION 40 +#define T_GPM_MOUSE_DRIVER 41 +#define T_XTERM_FOR_OS2 42 +#define T_GRAPHICS_MODE 43 +#define T_IMAGE_LIBRARIES 44 +#define T_FONT_RENDERING 45 +#define T_INTERNAL 46 +#define T_OPENMP 47 +#define T_NOT_USED_IN_TEXT_MODE 48 +#define T_DISABLED 49 +#define T_THREAD 50 +#define T_THREADS 51 +#define T_THREADS5 52 +#define T_CONFIGURATION_DIRECTORY 53 +#define T_NONE 54 +#define T_KEYS 55 +#define T_KEYS_DESC 56 +#define T_KEYS_BRAILLE_DESC 57 +#define T_COPYING 58 +#define T_COPYING_DESC 59 +#define T_RESOURCES 60 +#define T_MEMORY_CACHE 61 +#define T_DECOMPRESSED_CACHE 62 +#define T_FONT_CACHE 63 +#define T_IMAGE_CACHE 64 +#define T_FORMATTED_DOCUMENT_CACHE 65 +#define T_DNS_CACHE 66 +#define T_TLS_SESSION_CACHE 67 +#define T_HANDLES 68 +#define T_TIMERS 69 +#define T_WAITING 70 +#define T_CONNECTING 71 +#define T_tRANSFERRING 72 +#define T_KEEPALIVE 73 +#define T_BYTES 74 +#define T_LETTERS 75 +#define T_FILES 76 +#define T_LOCKED 77 +#define T_LOADING 78 +#define T_IMAGES 79 +#define T_DOCUMENTS 80 +#define T_SERVERS 81 +#define T_MEMORY_ALLOCATED 82 +#define T_BLOCKS_ALLOCATED 83 +#define T_MEMORY_LARGE_BLOCKS 84 +#define T_BLOCKS_LARGE_BLOCKS 85 +#define T_MEMORY_REQUESTED 86 +#define T_BLOCKS_REQUESTED 87 +#define T_JS_MEMORY_ALLOCATED 88 +#define T_MEMORY_INFO 89 +#define T_MOST_ALLOCATED 90 +#define T_LARGEST_BLOCKS 91 +#define T_NO_HISTORY 92 +#define T_NO_DOWNLOADS 93 +#define T_NO_FRAMES 94 +#define T_VT_100_FRAMES 95 +#define T_LINUX_OR_OS2_FRAMES 96 +#define T_KOI8R_FRAMES 97 +#define T_FREEBSD_FRAMES 98 +#define T_UTF8_FRAMES 99 +#define T_USE_11M 100 +#define T_RESTRICT_FRAMES_IN_CP850_852 101 +#define T_BLOCK_CURSOR 102 +#define T_COLOR 103 +#define T_BRAILLE_TERMINAL 104 +#define T_TERMINAL_OPTIONS 105 +#define T_SCREEN_MARGINS 106 +#define T_LEFT_MARGIN 107 +#define T_RIGHT_MARGIN 108 +#define T_TOP_MARGIN 109 +#define T_BOTTOM_MARGIN 110 +#define T_MARGINS_TOO_LARGE 111 +#define T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN 112 +#define T_NETWORK_OPTIONS 113 +#define T_IPV6_OPTIONS 114 +#define T_IPV6_DEFAULT 115 +#define T_IPV6_PREFER_IPV4 116 +#define T_IPV6_PREFER_IPV6 117 +#define T_IPV6_USE_ONLY_IPV4 118 +#define T_IPV6_USE_ONLY_IPV6 119 +#define T_PROXIES 120 +#define T_HTTP_PROXY__HOST_PORT 121 +#define T_FTP_PROXY__HOST_PORT 122 +#define T_HTTPS_PROXY__HOST_PORT 123 +#define T_SOCKS_4A_PROXY__USER_HOST_PORT 124 +#define T_APPEND_TEXT_TO_SOCKS_LOOKUPS 125 +#define T_NOPROXY_LIST 126 +#define T_ONLY_PROXIES 127 +#define T_TOR_MODE_ENABLED 128 +#define T_SSL_OPTIONS 129 +#define T_ACCEPT_INVALID_CERTIFICATES 130 +#define T_WARN_ON_INVALID_CERTIFICATES 131 +#define T_REJECT_INVALID_CERTIFICATES 132 +#define T_USE_BUILT_IN_CERTIFICATES 133 +#define T_CLIENT_CERTIFICATE_KEY_FILE 134 +#define T_CLIENT_CERTIFICATE_FILE 135 +#define T_CLIENT_CERTIFICATE_KEY_PASSWORD 136 +#define T_BAD_FILE 137 +#define T_THE_FILE_DOES_NOT_EXIST 138 +#define T_THE_FILE_HAS_INVALID_FORMAT 139 +#define T_ERROR_INITIALIZING_BUILT_IN_CERTIFICATES 140 +#define T_FAILED 141 +#define T_DNS_OPTIONS 142 +#define T_DNS_OVER_HTTPS_URL 143 +#define T_CONNECTIONS 144 +#define T_MAX_CONNECTIONS 145 +#define T_MAX_CONNECTIONS_TO_ONE_HOST 146 +#define T_RETRIES 147 +#define T_RECEIVE_TIMEOUT_SEC 148 +#define T_TIMEOUT_WHEN_UNRESTARTABLE 149 +#define T_TIMEOUT_WHEN_TRYING_MULTIPLE_ADDRESSES 150 +#define T_TIMEOUT_WHEN_TRYING_KEEPALIVE_CONNECTION 151 +#define T_BIND_TO_LOCAL_IP_ADDRESS 152 +#define T_BIND_TO_LOCAL_IPV6_ADDRESS 153 +#define T_ASYNC_DNS_LOOKUP 154 +#define T_SET_TIME_OF_DOWNLOADED_FILES 155 +#define T_CACHE_OPTIONS 156 +#define T_MEMORY_CACHE_SIZE__KB 157 +#define T_IMAGE_CACHE_SIZE__KB 158 +#define T_FONT_CACHE_SIZE__KB 159 +#define T_NUMBER_OF_FORMATTED_DOCUMENTS 160 +#define T_AGGRESSIVE_CACHE 161 +#define T_HTML_OPTIONS 162 +#define T_DISPLAY_TABLES 163 +#define T_DISPLAY_FRAMES 164 +#define T_BREAK_LONG_LINES 165 +#define T_DISPLAY_IMAGES 166 +#define T_DISPLAY_IMAGE_FILENAMES 167 +#define T_DISPLAY_LINKS_TO_IMAGES 168 +#define T_LINK_ORDER_BY_COLUMNS 169 +#define T_NUMBERED_LINKS 170 +#define T_AUTO_REFRESH 171 +#define T_TARGET_IN_NEW_WINDOW 172 +#define T_TEXT_MARGIN 173 +#define T_DEFAULT_CODEPAGE 174 +#define T_IGNORE_CHARSET_INFO_SENT_BY_SERVER 175 +#define T_TEXT_COLOR 176 +#define T_LINK_COLOR 177 +#define T_BACKGROUND_COLOR 178 +#define T_IGNORE_DOCUMENT_COLOR 179 +#define T_COLOR_0 180 +#define T_COLOR_1 181 +#define T_COLOR_2 182 +#define T_COLOR_3 183 +#define T_COLOR_4 184 +#define T_COLOR_5 185 +#define T_COLOR_6 186 +#define T_COLOR_7 187 +#define T_COLOR_8 188 +#define T_COLOR_9 189 +#define T_COLOR_10 190 +#define T_COLOR_11 191 +#define T_COLOR_12 192 +#define T_COLOR_13 193 +#define T_COLOR_14 194 +#define T_COLOR_15 195 +#define T_GOTO_URL 196 +#define T_GO_BACK 197 +#define T_GO_FORWARD 198 +#define T_HISTORY 199 +#define T_RELOAD 200 +#define T_NEW_WINDOW 201 +#define T_SAVE_AS 202 +#define T_SAVE_URL_AS 203 +#define T_SAVE_FORMATTED_DOCUMENT 204 +#define T_COPY_URL_LOCATION 205 +#define T_KILL_BACKGROUND_CONNECTIONS 206 +#define T_KILL_ALL_CONNECTIONS 207 +#define T_FLUSH_ALL_CACHES 208 +#define T_RESOURCE_INFO 209 +#define T_OS_SHELL 210 +#define T_EXIT 211 +#define T_SEARCH 212 +#define T_SEARCH_BACK 213 +#define T_FIND_NEXT 214 +#define T_FIND_PREVIOUS 215 +#define T_TOGGLE_HTML_PLAIN 216 +#define T_DOCUMENT_INFO 217 +#define T_FRAME_AT_FULL_SCREEN 218 +#define T_SAVE_CLIPBOARD_TO_A_FILE 219 +#define T_LOAD_CLIPBOARD_FROM_A_FILE 220 +#define T_THE_CLIPBOARD_IS_EMPTY 221 +#define T_SAVE_HTML_OPTIONS 222 +#define T_CHARACTER_SET 223 +#define T_DEFAULT_CHARSET 224 +#define T_CACHE 225 +#define T_MAIL_AND_TELNEL 226 +#define T_MAIL_TELNET_AND_SHELL 227 +#define T_ASSOCIATIONS 228 +#define T_FILE_EXTENSIONS 229 +#define T_SAVE_OPTIONS 230 +#define T_FILE 231 +#define T_VIEW 232 +#define T_LINK 233 +#define T_DOWNLOADS 234 +#define T_WINDOWS 235 +#define T_SETUP 236 +#define T_HELP 237 +#define T_ENTER_URL 238 +#define T_SAVE_URL 239 +#define T_DOWNLOAD 240 +#define T_SAVE_TO_FILE 241 +#define T_SEARCH_FOR_TEXT 242 +#define T_PAGE_P 243 +#define T_PAGE_OF 244 +#define T_PAGE_CL 245 +#define T_FORMATTING_DOCUMENT 246 +#define T_SEARCHING 247 +#define T_WAITING_IN_QUEUE 248 +#define T_LOOKING_UP_HOST 249 +#define T_MAKING_CONNECTION 250 +#define T_MAKING_CONNECTION_TO_ANOTHER_ADDRESS 251 +#define T_SOCKS_NEGOTIATION 252 +#define T_SSL_NEGOTIATION 253 +#define T_REQUEST_SENT 254 +#define T_LOGGING_IN 255 +#define T_GETTING_HEADERS 256 +#define T_SERVER_IS_PROCESSING_REQUEST 257 +#define T_TRANSFERRING 258 +#define T_INTERRUPTED 259 +#define T_INTERNAL_ERROR 260 +#define T_OUT_OF_MEMORY 261 +#define T_HOST_NOT_FOUND 262 +#define T_PROXY_NOT_FOUND 263 +#define T_ERROR_WRITING_TO_SOCKET 264 +#define T_ERROR_READING_FROM_SOCKET 265 +#define T_DATA_MODIFIED 266 +#define T_BAD_URL_SYNTAX 267 +#define T_BAD_PROXY_SYNTAX 268 +#define T_RECEIVE_TIMEOUT 269 +#define T_REQUEST_MUST_BE_RESTARTED 270 +#define T_CANT_GET_SOCKET_STATE 271 +#define T_CYCLIC_REDIRECT 272 +#define T_TOO_LARGE_FILE 273 +#define T_BAD_HTTP_RESPONSE 274 +#define T_HTTP_100 275 +#define T_NO_CONTENT 276 +#define T_HTTPS_FWD_ERROR 277 +#define T_INVALID_CERTIFICATE 278 +#define T_DOWNGRADED_METHOD 279 +#define T_INSECURE_CIPHER 280 +#define T_UNKNOWN_FILE_TYPE 281 +#define T_ERROR_OPENING_FILE 282 +#define T_BAD_FTP_RESPONSE 283 +#define T_FTP_SERVICE_UNAVAILABLE 284 +#define T_BAD_FTP_LOGIN 285 +#define T_FTP_PORT_COMMAND_FAILED 286 +#define T_FILE_NOT_FOUND 287 +#define T_FTP_FILE_ERROR 288 +#define T_SSL_ERROR 289 +#define T_NO_SSL 290 +#define T_BAD_SOCKS_VERSION 291 +#define T_SOCKS_REJECTED_OR_FAILED 292 +#define T_SOCKS_NO_IDENTD 293 +#define T_SOCKS_BAD_USERID 294 +#define T_SOCKS_UNKNOWN_ERROR 295 +#define T_NO_SMB_CLIENT 296 +#define T_BLOCKED_URL 297 +#define T_SMB_NOT_ALLOWED 298 +#define T_FILE_NOT_ALLOWED 299 +#define T_NO_PROXY 300 +#define T_UNKNOWN_ERROR 301 +#define T_RECEIVED 302 +#define T_OF 303 +#define T_AVG 304 +#define T_CUR 305 +#define T_AVERAGE_SPEED 306 +#define T_SPEED 307 +#define T_CURRENT_SPEED 308 +#define T_ELAPSED_TIME 309 +#define T_ESTIMATED_TIME 310 +#define T_BACKGROUND 311 +#define T_ABORT 312 +#define T_ABORT_AND_DELETE_FILE 313 +#define T_YES 314 +#define T_NO 315 +#define T_NEVER 316 +#define T_DIRECTORY 317 +#define T_FILE_ALREADY_EXISTS 318 +#define T_ALREADY_EXISTS_AS_DOWNLOAD 319 +#define T_ALREADY_EXISTS 320 +#define T_DO_YOU_WISH_TO_CONTINUE 321 +#define T_DO_YOU_WISH_TO_OVERWRITE 322 +#define T_CONTINUE 323 +#define T_OVERWRITE 324 +#define T_RENAME 325 +#define T_DOWNLOAD_ERROR 326 +#define T_COULD_NOT_WRITE_TO_FILE 327 +#define T_ERROR_DOWNLOADING 328 +#define T_ERROR_LOADING 329 +#define T_COULD_NOT_CREATE_FILE 330 +#define T_COULD_NOT_CREATE_TEMPORARY_FILE 331 +#define T_ERROR_CALLING_LSEEK_ON_FILE 332 +#define T_TOO_LARGE_FILE_SEQUENCE 333 +#define T_UNKNOWN_TYPE 334 +#define T_CONTENT_TYPE_IS 335 +#define T_DO_YOU_WANT_TO_OPEN_SAVE_OR_DISPLAY_THIS_FILE 336 +#define T_DO_YOU_WANT_TO_OPEN_OR_DISPLAY_THIS_FILE 337 +#define T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE 338 +#define T_SAVE 339 +#define T_DISPLAY 340 +#define T_WHAT_TO_DO 341 +#define T_DO_YOU_WANT_TO_OPEN_FILE_WITH 342 +#define T_SAVE_IT_OR_DISPLAY_IT 343 +#define T_OPEN 344 +#define T_OPEN_WITH 345 +#define T_DO_YOU_WANT_TO_FOLLOW_REDIRECT_AND_POST_FORM_DATA_TO_URL 346 +#define T_DO_YOU_WANT_TO_POST_FORM_DATA_TO_URL 347 +#define T_DO_YOU_WANT_TO_REPOST_FORM_DATA_TO_URL 348 +#define T_WARNING 349 +#define T_ERROR 350 +#define T_WELCOME 351 +#define T_WELCOME_TO_LINKS 352 +#define T_BASIC_HELP 353 +#define T_LABEL 354 +#define T_CONTENT_TYPES 355 +#define T_PROGRAM__IS_REPLACED_WITH_FILE_NAME 356 +#define T_BLOCK_TERMINAL_WHILE_PROGRAM_RUNNING 357 +#define T_RUN_ON_TERMINAL 358 +#define T_RUN_IN_XWINDOW 359 +#define T_ASK_BEFORE_OPENING 360 +#define T_ACCEPT_HTTP 361 +#define T_ACCEPT_FTP 362 +#define T_DELETE_ASSOCIATION 363 +#define T_ASSOCIATION 364 +#define T_EXTENSION_S 365 +#define T_CONTENT_TYPE 366 +#define T_DELETE_EXTENSION 367 +#define T_EXTENSION 368 +#define T_eXTENSION 369 +#define T_ERROR_WHILE_POSTING_FORM 370 +#define T_COULD_NOT_GET_FILE 371 +#define T_READING_FILES_IS_NOT_ALLOWED 372 +#define T_NO_PREVIOUS_SEARCH 373 +#define T_SEARCH_STRING_NOT_FOUND 374 +#define T_SAVE_ERROR 375 +#define T_ERROR_WRITING_TO_FILE 376 +#define T_ERROR_READING_THE_FILE 377 +#define T_DISPLAY_USEMAP 378 +#define T_FOLLOW_LINK 379 +#define T_OPEN_IN_NEW_WINDOW 380 +#define T_DOWNLOAD_LINK 381 +#define T_RESET_FORM 382 +#define T_SUBMIT_FORM 383 +#define T_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW 384 +#define T_SUBMIT_FORM_AND_DOWNLOAD 385 +#define T_VIEW_IMAGE 386 +#define T_DOWNLOAD_IMAGE 387 +#define T_SCALE_IMAGE_TO_FULL_SCREEN 388 +#define T_NO_LINK_SELECTED 389 +#define T_IMAGE 390 +#define T_USEMAP 391 +#define T_XTERM 392 +#define T_TWTERM 393 +#define T_SCREEN 394 +#define T_WINDOW 395 +#define T_FULL_SCREEN 396 +#define T_BEOS_TERMINAL 397 +#define T_UNABLE_TO_OPEN_NEW_WINDOW 398 +#define T_JAVASCRIPT 399 +#define T_SUBMIT_FORM_TO 400 +#define T_POST_FORM_TO 401 +#define T_RADIO_BUTTON 402 +#define T_CHECKBOX 403 +#define T_SELECT_FIELD 404 +#define T_TEXT_FIELD 405 +#define T_TEXT_AREA 406 +#define T_FILE_UPLOAD 407 +#define T_PASSWORD_FIELD 408 +#define T_BUTTON 409 +#define T_NAME 410 +#define T_VALUE 411 +#define T_HIT_ENTER_TO 412 +#define T_SUBMIT_TO 413 +#define T_POST_TO 414 +#define T_INFO 415 +#define T_HEADER_INFO 416 +#define T_YOU_ARE_NOWHERE 417 +#define T_NO_HEADER 418 +#define T_URL 419 +#define T_IP_ADDRESS 420 +#define T_IP_ADDRESSES 421 +#define T_SIZE 422 +#define T_COMPRESSED_WITH 423 +#define T_INCOMPLETE 424 +#define T_CODEPAGE 425 +#define T_ASSUMED 426 +#define T_IGNORING_SERVER_SETTING 427 +#define T_SERVER 428 +#define T_DATE 429 +#define T_LAST_MODIFIED 430 +#define T_SSL_CIPHER 431 +#define T_CERTIFICATE_AUTHORITY 432 +#define T_CERTIFICATE_AUTHORITIES 433 +#define T_LANGUAGE 434 +#define T_DEFAULT_LANG 435 +#define T_GO_TO_LINK 436 +#define T_ENTER_LINK_NUMBER 437 +#define T_RESIZE_TERMINAL 438 +#define T_COLUMNS 439 +#define T_ROWS 440 +#define T_GOTO 441 +#define T_CLOSE 442 +#define T_FOLDER 443 +#define T_fOLDER 444 +#define T_ADD 445 +#define T_DELETE 446 +#define T_EDIT 447 +#define T_SELECT 448 +#define T_MOVE 449 +#define T_NO_ITEMS_SELECTED 450 +#define T_UNSELECT_ALL 451 +#define T_BOOKMARKS 452 +#define T_BOOKMARK 453 +#define T_ADD_BOOKMARK 454 +#define T_ADD_ASSOCIATION 455 +#define T_ADD_EXTENSION 456 +#define T_ADD_FOLDER 457 +#define T_BOOKMARK_TITLE 458 +#define T_EDIT_BOOKMARK 459 +#define T_EDIT_ASSOCIATION 460 +#define T_EDIT_EXTENSION 461 +#define T_DELETE_BOOKMARK 462 +#define T_EDIT_FOLDER 463 +#define T_DELETE_FOLDER 464 +#define T_NOT_EMPTY_SURE_DELETE 465 +#define T_BOOKMARK_MANAGER 466 +#define T_ASSOCIATIONS_MANAGER 467 +#define T_EXTENSIONS_MANAGER 468 +#define T_url 469 +#define T_NNAME 470 +#define T_EXIT_LINKS 471 +#define T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW 472 +#define T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS 473 +#define T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS 474 +#define T_HTTP_OPTIONS 475 +#define T_FTP_OPTIONS 476 +#define T_SMB_OPTIONS 477 +#define T_HTTP_BUG_WORKAROUNDS 478 +#define T_USE_HTTP_10 479 +#define T_ALLOW_SERVER_BLACKLIST 480 +#define T_DO_NOT_SEND_ACCEPT_CHARSET 481 +#define T_DO_NOT_ADVERTISE_COMPRESSION_SUPPORT 482 +#define T_RETRY_ON_INTERNAL_ERRORS 483 +#define T_HEADER_OPTIONS 484 +#define T_HTTP_HEADER_OPTIONS 485 +#define T_FAKE_FIREFOX 486 +#define T_DO_NOT_TRACK 487 +#define T_REFERER_NONE 488 +#define T_REFERER_SAME_URL 489 +#define T_REFERER_FAKE 490 +#define T_REFERER_REAL_SAME_SERVER 491 +#define T_REFERER_REAL 492 +#define T_FAKE_REFERER 493 +#define T_FAKE_USERAGENT 494 +#define T_EXTRA_HEADER 495 +#define T_PASSWORD_FOR_ANONYMOUS_LOGIN 496 +#define T_USE_PASSIVE_FTP 497 +#define T_USE_EPRT_EPSV 498 +#define T_SET_TYPE_OF_SERVICE 499 +#define T_ALLOW_HYPERLINKS_TO_SMB 500 +#define T_MANUAL 501 +#define T_HOMEPAGE 502 +#define T_CALIBRATION 503 +#define T_MAILTO_PROG 504 #define T_TELNET_PROG 505 -#define T_MAGNET_PROG 506 -#define T_TN3270_PROG 507 -#define T_MMS_PROG 508 -#define T_MAIL_AND_TELNET_PROGRAMS 509 -#define T_MAIL_TELNET_AND_SHELL_PROGRAMS 510 -#define T_NO_PROGRAM 511 -#define T_NO_PROGRAM_SPECIFIED_FOR 512 -#define T_MAIL 513 -#define T_TELNET 514 -#define T_MAGNET 515 -#define T_TN3270 516 -#define T_MMS 517 -#define T_BAD_MAILTO_URL 518 -#define T_BAD_TELNET_URL 519 -#define T_BAD_TN3270_URL 520 -#define T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS 521 -#define T_AUTHORIZATION_REQUIRED 522 -#define T_PROXY_AUTHORIZATION_REQUIRED 523 -#define T_USERID 524 -#define T_PASSWORD 525 -#define T_ENTER_USERNAME 526 -#define T_AT 527 -#define T_THE_SERVER_ 528 -#define T_DOESNT_HAVE_A_VALID_CERTIFICATE 529 -#define T_USES_DOWNGRADED_METHOD 530 -#define T_USES_INSECURE_CIPHER 531 -#define T_WAITING_FOR_REDIRECT_CONFIRMATION 532 -#define T_DECOMPRESSION_ERROR 533 -#define T_ERROR_DECOMPRESSING_ 534 -#define T__wITH_ 535 -#define T_COMPRESSED_ERROR 536 -#define T_UNKNOWN_COMPRESSION_METHOD 537 -#define T_SURE_DELETE 538 -#define T_BOOKMARKS_ALREADY_IN_USE 539 -#define T_ASSOCIATIONS_ALREADY_IN_USE 540 -#define T_EXTENSIONS_ALREADY_IN_USE 541 -#define T_VIDEO_OPTIONS 542 -#define T_VIDEO_OPTIONS_TEXT 543 -#define T_RED_DISPLAY_GAMMA 544 -#define T_GREEN_DISPLAY_GAMMA 545 -#define T_BLUE_DISPLAY_GAMMA 546 -#define T_USER_GAMMA 547 -#define T_ASPECT_RATIO 548 -#define T_DITHER_LETTERS 549 -#define T_DITHER_IMAGES 550 -#define T_8_BIT_GAMMA_CORRECTION 551 -#define T_16_BIT_GAMMA_CORRECTION 552 -#define T_AUTO_GAMMA_CORRECTION 553 -#define T_RGB_PALETTE_8x8x4 554 -#define T_RGB_PALETTE_6x6x6 555 -#define T_SWITCH_PALETTE 556 -#define T_OVERWRITE_SCREEN_INSTEAD_OF_SCROLLING_IT 557 -#define T_ALERT 558 -#define T_QUESTION 559 -#define T_KILL_SCRIPT 560 -#define T_KILL_ALL_SCRIPTS 561 -#define T_SCRIPT_KILLED_BY_USER 562 -#define T_SCRIPT_TRYING_TO_CLOSE_WINDOW 563 -#define T_ENTER_STRING 564 -#define T_JAVASCRIPT_OPTIONS 565 -#define T_ENABLE_JAVASCRIPT 566 -#define T_VERBOSE_JS_ERRORS 567 -#define T_VERBOSE_JS_WARNINGS 568 -#define T_MISCELANEOUS_OPTIONS 569 -#define T_FONTS 570 -#define T_REGULAR_FONT 571 -#define T_BOLD_FONT 572 -#define T_MONOSPACED_FONT 573 -#define T_MONOSPACED_BOLD_FONT 574 -#define T_ITALIC_FONT 575 -#define T_ITALIC_BOLD_FONT 576 -#define T_MONOSPACED_ITALIC_FONT 577 -#define T_MONOSPACED_ITALIC_BOLD_FONT 578 -#define T_BUILT_IN_FONT 579 -#define T_JAVASCRIPT_ERROR 580 -#define T_JAVASCRIPT_WARNING 581 -#define T_DISMISS 582 -#define T_MENU_FONT_SIZE 583 -#define T_USER_FONT_SIZE 584 -#define T_TURN_OFF_WARNINGS 585 -#define T_BOOKMARKS_ENCODING 586 -#define T_JS_IS_ATTEMPTING_TO_GO_TO_URL 587 -#define T_JS_IS_ATTEMPTING_TO_OPEN_NEW_WINDOW_WITH_URL 588 -#define T_JS_IS_ATTEMPTING_TO_GO_INTO_HISTORY 589 -#define T_TO_URL 590 -#define T_GOTO_HISTORY 591 -#define T_ALLOW 592 -#define T_REJECT 593 -#define T_ENABLE_ALL_CONVERSIONS 594 -#define T_ENABLE_GLOBAL_NAME_RESOLUTION 595 -#define T_MANUAL_JS_CONTROL 596 -#define T_JS_RECURSION_DEPTH 597 -#define T_MENU_BACKGROUND_COLOR 598 -#define T_MENU_FOREGROUND_COLOR 599 -#define T_SCROLL_BAR_BAR_COLOR 600 -#define T_SCROLL_BAR_AREA_COLOR 601 -#define T_SCROLL_BAR_FRAME_COLOR 602 -#define T_BOOKMARKS_FILE 603 -#define T_SAVE_URL_HISTORY_ON_EXIT 604 -#define T_COOKIES 605 -#define T_ENABLE_COOKIES 606 -#define T_SAVE_COOKIES 607 -#define T_MAX_COOKIE_AGE 608 -#define T_CLEAR_COOKIES 609 -#define T_COOKIES_WERE_CLEARED 610 -#define T_ENTER_COLORS_AS_RGB_TRIPLETS 611 -#define T_JS_MEMORY_LIMIT_KB 612 -#define T_SCALE_ALL_IMAGES_BY 613 -#define T_PORN_ENABLE 614 -#define T_DISPLAY_OPTIMIZATION_CRT 615 -#define T_DISPLAY_OPTIMIZATION_LCD_RGB 616 -#define T_DISPLAY_OPTIMIZATION_LCD_BGR 617 -#define T_KEYBOARD_CODEPAGE 618 -#define T_COPY_LINK_LOCATION 619 -#define T_BLOCK_URL 620 -#define T_BLOCK_LIST 621 -#define T_BLOCKED_IMAGE 622 -#define T_BLOCK_LIST_IN_USE 623 -#define T_BLOCK_LIST_MANAGER 624 -#define T_BLOCK_ADD 625 -#define T_BLOCK_EDIT 626 -#define T_BLOCK_DELETE 627 -#define T_HK_GOTO_URL 628 -#define T_HK_GO_BACK 629 -#define T_HK_GO_FORWARD 630 -#define T_HK_HISTORY 631 -#define T_HK_RELOAD 632 -#define T_HK_BOOKMARKS 633 -#define T_HK_NEW_WINDOW 634 -#define T_HK_SAVE_AS 635 -#define T_HK_SAVE_URL_AS 636 -#define T_HK_SAVE_FORMATTED_DOCUMENT 637 -#define T_HK_COPY_URL_LOCATION 638 -#define T_HK_KILL_BACKGROUND_CONNECTIONS 639 -#define T_HK_KILL_ALL_CONNECTIONS 640 -#define T_HK_FLUSH_ALL_CACHES 641 -#define T_HK_RESOURCE_INFO 642 -#define T_HK_MEMORY_INFO 643 -#define T_HK_OS_SHELL 644 -#define T_HK_RESIZE_TERMINAL 645 -#define T_HK_EXIT 646 -#define T_HK_SEARCH 647 -#define T_HK_SEARCH_BACK 648 -#define T_HK_FIND_NEXT 649 -#define T_HK_FIND_PREVIOUS 650 -#define T_HK_TOGGLE_HTML_PLAIN 651 -#define T_HK_DOCUMENT_INFO 652 -#define T_HK_HEADER_INFO 653 -#define T_HK_FRAME_AT_FULL_SCREEN 654 -#define T_HK_SAVE_CLIPBOARD_TO_A_FILE 655 -#define T_HK_LOAD_CLIPBOARD_FROM_A_FILE 656 -#define T_HK_HTML_OPTIONS 657 -#define T_HK_COLOR 658 -#define T_HK_SAVE_HTML_OPTIONS 659 -#define T_HK_LANGUAGE 660 -#define T_HK_CHARACTER_SET 661 -#define T_HK_TERMINAL_OPTIONS 662 -#define T_HK_SCREEN_MARGINS 663 -#define T_HK_VIDEO_OPTIONS 664 -#define T_HK_NETWORK_OPTIONS 665 -#define T_HK_CONNECTIONS 666 -#define T_HK_IPV6_OPTIONS 667 -#define T_HK_PROXIES 668 -#define T_HK_SSL_OPTIONS 669 -#define T_HK_HTTP_OPTIONS 670 -#define T_HK_FTP_OPTIONS 671 -#define T_HK_SMB_OPTIONS 672 -#define T_HK_JAVASCRIPT_OPTIONS 673 -#define T_HK_MISCELANEOUS_OPTIONS 674 -#define T_HK_COOKIES 675 -#define T_HK_FONTS 676 -#define T_HK_CACHE 677 -#define T_HK_MAIL_AND_TELNEL 678 -#define T_HK_ASSOCIATIONS 679 -#define T_HK_FILE_EXTENSIONS 680 -#define T_HK_BLOCK_LIST 681 -#define T_HK_SAVE_OPTIONS 682 -#define T_HK_ABOUT 683 -#define T_HK_KEYS 684 -#define T_HK_COPYING 685 -#define T_HK_MANUAL 686 -#define T_HK_HOMEPAGE 687 -#define T_HK_CALIBRATION 688 -#define T_HK_FILE 689 -#define T_HK_VIEW 690 -#define T_HK_LINK 691 -#define T_HK_DOWNLOADS 692 -#define T_HK_WINDOWS 693 -#define T_HK_SETUP 694 -#define T_HK_HELP 695 -#define T_HK_DISPLAY_USEMAP 696 -#define T_HK_FOLLOW_LINK 697 -#define T_HK_OPEN_IN_NEW_WINDOW 698 -#define T_HK_DOWNLOAD_LINK 699 -#define T_HK_RESET_FORM 700 -#define T_HK_SUBMIT_FORM 701 -#define T_HK_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW 702 -#define T_HK_SUBMIT_FORM_AND_DOWNLOAD 703 -#define T_HK_VIEW_IMAGE 704 -#define T_HK_DOWNLOAD_IMAGE 705 -#define T_HK_SCALE_IMAGE_TO_FULL_SCREEN 706 -#define T_HK_COPY_LINK_LOCATION 707 -#define T_HK_BLOCK_URL 708 -#define T_HK_XTERM 709 -#define T_HK_TWTERM 710 -#define T_HK_SCREEN 711 -#define T_HK_WINDOW 712 -#define T_HK_FULL_SCREEN 713 -#define T_HK_BEOS_TERMINAL 714 -#define T_URL_MANUAL 715 -#define T_URL_HOMEPAGE 716 -#define T_URL_CALIBRATION 717 -#define T__N_TEXTS 718 +#define T_TN3270_PROG 506 +#define T_MMS_PROG 507 +#define T_MAGNET_PROG 508 +#define T_GOPHER_PROG 509 +#define T_SHELL_PROG 510 +#define T_MAIL_AND_TELNET_PROGRAMS 511 +#define T_MAIL_TELNET_AND_SHELL_PROGRAMS 512 +#define T_NO_PROGRAM 513 +#define T_NO_PROGRAM_SPECIFIED_FOR 514 +#define T_MAIL 515 +#define T_TELNET 516 +#define T_TN3270 517 +#define T_MMS 518 +#define T_MAGNET 519 +#define T_GOPHER 520 +#define T_BAD_MAILTO_URL 521 +#define T_BAD_TELNET_URL 522 +#define T_BAD_TN3270_URL 523 +#define T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS 524 +#define T_AUTHORIZATION_REQUIRED 525 +#define T_PROXY_AUTHORIZATION_REQUIRED 526 +#define T_USERID 527 +#define T_PASSWORD 528 +#define T_ENTER_USERNAME 529 +#define T_AT 530 +#define T_THE_SERVER_ 531 +#define T_DOESNT_HAVE_A_VALID_CERTIFICATE 532 +#define T_USES_DOWNGRADED_METHOD 533 +#define T_USES_INSECURE_CIPHER 534 +#define T_WAITING_FOR_REDIRECT_CONFIRMATION 535 +#define T_DECOMPRESSION_ERROR 536 +#define T_ERROR_DECOMPRESSING_ 537 +#define T__wITH_ 538 +#define T_COMPRESSED_ERROR 539 +#define T_UNKNOWN_COMPRESSION_METHOD 540 +#define T_SURE_DELETE 541 +#define T_BOOKMARKS_ALREADY_IN_USE 542 +#define T_ASSOCIATIONS_ALREADY_IN_USE 543 +#define T_EXTENSIONS_ALREADY_IN_USE 544 +#define T_VIDEO_OPTIONS 545 +#define T_VIDEO_OPTIONS_TEXT 546 +#define T_RED_DISPLAY_GAMMA 547 +#define T_GREEN_DISPLAY_GAMMA 548 +#define T_BLUE_DISPLAY_GAMMA 549 +#define T_USER_GAMMA 550 +#define T_ASPECT_RATIO 551 +#define T_DITHER_LETTERS 552 +#define T_DITHER_IMAGES 553 +#define T_8_BIT_GAMMA_CORRECTION 554 +#define T_16_BIT_GAMMA_CORRECTION 555 +#define T_AUTO_GAMMA_CORRECTION 556 +#define T_RGB_PALETTE_8x8x4 557 +#define T_RGB_PALETTE_6x6x6 558 +#define T_SWITCH_PALETTE 559 +#define T_OVERWRITE_SCREEN_INSTEAD_OF_SCROLLING_IT 560 +#define T_ALERT 561 +#define T_QUESTION 562 +#define T_KILL_SCRIPT 563 +#define T_KILL_ALL_SCRIPTS 564 +#define T_SCRIPT_KILLED_BY_USER 565 +#define T_SCRIPT_TRYING_TO_CLOSE_WINDOW 566 +#define T_ENTER_STRING 567 +#define T_JAVASCRIPT_OPTIONS 568 +#define T_ENABLE_JAVASCRIPT 569 +#define T_VERBOSE_JS_ERRORS 570 +#define T_VERBOSE_JS_WARNINGS 571 +#define T_MISCELANEOUS_OPTIONS 572 +#define T_FONTS 573 +#define T_REGULAR_FONT 574 +#define T_BOLD_FONT 575 +#define T_MONOSPACED_FONT 576 +#define T_MONOSPACED_BOLD_FONT 577 +#define T_ITALIC_FONT 578 +#define T_ITALIC_BOLD_FONT 579 +#define T_MONOSPACED_ITALIC_FONT 580 +#define T_MONOSPACED_ITALIC_BOLD_FONT 581 +#define T_BUILT_IN_FONT 582 +#define T_JAVASCRIPT_ERROR 583 +#define T_JAVASCRIPT_WARNING 584 +#define T_DISMISS 585 +#define T_MENU_FONT_SIZE 586 +#define T_USER_FONT_SIZE 587 +#define T_TURN_OFF_WARNINGS 588 +#define T_BOOKMARKS_ENCODING 589 +#define T_JS_IS_ATTEMPTING_TO_GO_TO_URL 590 +#define T_JS_IS_ATTEMPTING_TO_OPEN_NEW_WINDOW_WITH_URL 591 +#define T_JS_IS_ATTEMPTING_TO_GO_INTO_HISTORY 592 +#define T_TO_URL 593 +#define T_GOTO_HISTORY 594 +#define T_ALLOW 595 +#define T_REJECT 596 +#define T_ENABLE_ALL_CONVERSIONS 597 +#define T_ENABLE_GLOBAL_NAME_RESOLUTION 598 +#define T_MANUAL_JS_CONTROL 599 +#define T_JS_RECURSION_DEPTH 600 +#define T_MENU_BACKGROUND_COLOR 601 +#define T_MENU_FOREGROUND_COLOR 602 +#define T_SCROLL_BAR_BAR_COLOR 603 +#define T_SCROLL_BAR_AREA_COLOR 604 +#define T_SCROLL_BAR_FRAME_COLOR 605 +#define T_BOOKMARKS_FILE 606 +#define T_SAVE_URL_HISTORY_ON_EXIT 607 +#define T_COOKIES 608 +#define T_ENABLE_COOKIES 609 +#define T_SAVE_COOKIES 610 +#define T_MAX_COOKIE_AGE 611 +#define T_CLEAR_COOKIES 612 +#define T_COOKIES_WERE_CLEARED 613 +#define T_ENTER_COLORS_AS_RGB_TRIPLETS 614 +#define T_JS_MEMORY_LIMIT_KB 615 +#define T_SCALE_ALL_IMAGES_BY 616 +#define T_PORN_ENABLE 617 +#define T_DISPLAY_OPTIMIZATION_CRT 618 +#define T_DISPLAY_OPTIMIZATION_LCD_RGB 619 +#define T_DISPLAY_OPTIMIZATION_LCD_BGR 620 +#define T_KEYBOARD_CODEPAGE 621 +#define T_COPY_LINK_LOCATION 622 +#define T_BLOCK_URL 623 +#define T_BLOCK_LIST 624 +#define T_BLOCKED_IMAGE 625 +#define T_BLOCK_LIST_IN_USE 626 +#define T_BLOCK_LIST_MANAGER 627 +#define T_BLOCK_ADD 628 +#define T_BLOCK_EDIT 629 +#define T_BLOCK_DELETE 630 +#define T_HK_GOTO_URL 631 +#define T_HK_GO_BACK 632 +#define T_HK_GO_FORWARD 633 +#define T_HK_HISTORY 634 +#define T_HK_RELOAD 635 +#define T_HK_BOOKMARKS 636 +#define T_HK_NEW_WINDOW 637 +#define T_HK_SAVE_AS 638 +#define T_HK_SAVE_URL_AS 639 +#define T_HK_SAVE_FORMATTED_DOCUMENT 640 +#define T_HK_COPY_URL_LOCATION 641 +#define T_HK_KILL_BACKGROUND_CONNECTIONS 642 +#define T_HK_KILL_ALL_CONNECTIONS 643 +#define T_HK_FLUSH_ALL_CACHES 644 +#define T_HK_RESOURCE_INFO 645 +#define T_HK_MEMORY_INFO 646 +#define T_HK_OS_SHELL 647 +#define T_HK_RESIZE_TERMINAL 648 +#define T_HK_EXIT 649 +#define T_HK_SEARCH 650 +#define T_HK_SEARCH_BACK 651 +#define T_HK_FIND_NEXT 652 +#define T_HK_FIND_PREVIOUS 653 +#define T_HK_TOGGLE_HTML_PLAIN 654 +#define T_HK_DOCUMENT_INFO 655 +#define T_HK_HEADER_INFO 656 +#define T_HK_FRAME_AT_FULL_SCREEN 657 +#define T_HK_SAVE_CLIPBOARD_TO_A_FILE 658 +#define T_HK_LOAD_CLIPBOARD_FROM_A_FILE 659 +#define T_HK_HTML_OPTIONS 660 +#define T_HK_COLOR 661 +#define T_HK_SAVE_HTML_OPTIONS 662 +#define T_HK_LANGUAGE 663 +#define T_HK_CHARACTER_SET 664 +#define T_HK_TERMINAL_OPTIONS 665 +#define T_HK_SCREEN_MARGINS 666 +#define T_HK_VIDEO_OPTIONS 667 +#define T_HK_NETWORK_OPTIONS 668 +#define T_HK_CONNECTIONS 669 +#define T_HK_IPV6_OPTIONS 670 +#define T_HK_PROXIES 671 +#define T_HK_SSL_OPTIONS 672 +#define T_HK_DNS_OPTIONS 673 +#define T_HK_HTTP_OPTIONS 674 +#define T_HK_FTP_OPTIONS 675 +#define T_HK_SMB_OPTIONS 676 +#define T_HK_JAVASCRIPT_OPTIONS 677 +#define T_HK_MISCELANEOUS_OPTIONS 678 +#define T_HK_COOKIES 679 +#define T_HK_FONTS 680 +#define T_HK_CACHE 681 +#define T_HK_MAIL_AND_TELNEL 682 +#define T_HK_ASSOCIATIONS 683 +#define T_HK_FILE_EXTENSIONS 684 +#define T_HK_BLOCK_LIST 685 +#define T_HK_SAVE_OPTIONS 686 +#define T_HK_ABOUT 687 +#define T_HK_KEYS 688 +#define T_HK_COPYING 689 +#define T_HK_MANUAL 690 +#define T_HK_HOMEPAGE 691 +#define T_HK_CALIBRATION 692 +#define T_HK_FILE 693 +#define T_HK_VIEW 694 +#define T_HK_LINK 695 +#define T_HK_DOWNLOADS 696 +#define T_HK_WINDOWS 697 +#define T_HK_SETUP 698 +#define T_HK_HELP 699 +#define T_HK_DISPLAY_USEMAP 700 +#define T_HK_FOLLOW_LINK 701 +#define T_HK_OPEN_IN_NEW_WINDOW 702 +#define T_HK_DOWNLOAD_LINK 703 +#define T_HK_RESET_FORM 704 +#define T_HK_SUBMIT_FORM 705 +#define T_HK_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW 706 +#define T_HK_SUBMIT_FORM_AND_DOWNLOAD 707 +#define T_HK_VIEW_IMAGE 708 +#define T_HK_DOWNLOAD_IMAGE 709 +#define T_HK_SCALE_IMAGE_TO_FULL_SCREEN 710 +#define T_HK_COPY_LINK_LOCATION 711 +#define T_HK_BLOCK_URL 712 +#define T_HK_XTERM 713 +#define T_HK_TWTERM 714 +#define T_HK_SCREEN 715 +#define T_HK_WINDOW 716 +#define T_HK_FULL_SCREEN 717 +#define T_HK_BEOS_TERMINAL 718 +#define T_URL_MANUAL 719 +#define T_URL_HOMEPAGE 720 +#define T_URL_CALIBRATION 721 +#define T__N_TEXTS 722 diff --git a/language.inc b/language.inc index 12b55c6..17216c9 100644 --- a/language.inc +++ b/language.inc @@ -15,7 +15,6 @@ static_const struct translation translation_bahasa_indonesian [] = { { "String kosong tidak dibolehkan" }, { NULL }, { NULL }, - { NULL }, { "Salah konfigurasi" }, { "Tidak dapat menulis pada berkas konfigurasi" }, { NULL }, @@ -144,6 +143,8 @@ static_const struct translation translation_bahasa_indonesian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Hubungan" }, { "Batas hubungan" }, { "Batas hubungan untuk satu host" }, @@ -505,20 +506,22 @@ static_const struct translation translation_bahasa_indonesian [] = { { "Halaman rumah" }, { "Pengukuran" }, { "Program surat (% diganti dengan alamat)" }, - { "Shell untuk menjalankan perintah eksternal (% diganti dengan perintah)" }, { "Program telnet (% diganti dengan \"host\" atau \"host port\")" }, - { NULL }, { "Program Tn3270 (% diganti dengan \"host\" atau \"host port\")" }, { "Program MMS (% diganti dengan URL)" }, + { NULL }, + { NULL }, + { "Shell untuk menjalankan perintah eksternal (% diganti dengan perintah)" }, { "Program Mail dan telnet" }, { "Program surat, telnet dan shell" }, { "Tidak ada program" }, { "Tidak ada program diberikan untuk" }, { "surat" }, { "telnet" }, - { NULL }, { "tn3270" }, { "mms" }, + { NULL }, + { NULL }, { "URL mailto salah" }, { "URL telnet salah" }, { "URL tn3270 salah" }, @@ -674,6 +677,7 @@ static_const struct translation translation_bahasa_indonesian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -736,7 +740,6 @@ static_const struct translation translation_belarusian [] = { { "\360\325\323\324\331\321 \322\301\304\313\246 \316\305 \304\301\332\327\301\314\321\300\303\303\301" }, { NULL }, { NULL }, - { NULL }, { "\360\301\315\331\314\313\301 \316\301\323\324\322\317\312\313\246" }, { "\356\305\315\301\307\336\331\315\301 \332\301\320\246\323\301\303\330 \325 \306\301\312\314 \316\301\323\324\322\317\305\313" }, { NULL }, @@ -865,6 +868,8 @@ static_const struct translation translation_belarusian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\372\314\325\336\334\316\316\321\256" }, { "\355\301\313\323. \313\317\314\330\313\301\323\303\330 \332\314\325\336\334\316\316\321\256" }, { "\355\301\313\323. \313\317\314\330\313\301\323\303\330 \332\314\325\336\334\316\316\321\256 \304\301 \301\304\316\301\307\317 \323\305\322\327\305\322\301" }, @@ -1226,11 +1231,12 @@ static_const struct translation translation_belarusian [] = { { NULL }, { NULL }, { "\360\322\301\307\322\301\315\301 \301\304\320\322\301\256\313\246 \320\317\333\324\331 (% \332\301\315\321\316\321\305\303\303\301 \316\301 \301\304\322\301\323)" }, - { NULL }, { "\360\322\301\307\322\301\315\301 telnet (% \332\301\315\321\316\321\305\303\303\301 \316\301 'host' \303\246 'host port')" }, - { NULL }, { "\360\322\301\307\322\301\315\301 tn3270 (% \332\301\315\321\316\321\305\303\303\301 \316\301 'host' \303\246 'host port')" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "\360\322\301\307\322\301\315\331 \304\314\321 \320\317\333\324\331 \246 telnet'\301" }, { NULL }, { "\356\321\315\301 \320\322\301\307\322\301\315\331" }, @@ -1240,6 +1246,7 @@ static_const struct translation translation_belarusian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "\356\321\320\322\301\327\246\314\330\316\331 \301\304\322\301\323 mailto:" }, { "\356\321\320\322\301\327\246\314\330\316\331 \301\304\322\301\323 telnet" }, { "\356\321\320\322\301\327\246\314\330\316\331 \301\304\322\301\323 tn3270" }, @@ -1440,6 +1447,7 @@ static_const struct translation translation_belarusian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, }; static_const struct translation translation_brazilian_portuguese [] = { @@ -1457,7 +1465,6 @@ static_const struct translation translation_brazilian_portuguese [] = { { "N\343o \351 permitido sequ\352ncia de caracteres vazia" }, { NULL }, { NULL }, - { NULL }, { "Erro de configura\347\343o" }, { "N\343o posso escrever no arquivo de configura\347\343o" }, { NULL }, @@ -1586,6 +1593,8 @@ static_const struct translation translation_brazilian_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Conex\365es" }, { "N\372mero m\341ximo de conex\365es" }, { "N\372mero M\341ximo de conex\365es a um host" }, @@ -1947,20 +1956,22 @@ static_const struct translation translation_brazilian_portuguese [] = { { NULL }, { NULL }, { "Cliente de e-mail (% ser\341 substituido pelo endere\347o)" }, - { NULL }, { "Cliente telnet (% ser\341 substituido por \"host\" or \"host port\")" }, - { NULL }, { "Cliente tn3270 (% ser\341 substituido por \"host\" or \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Clientes de e-mail e telnet" }, { NULL }, { "Nenhum programa" }, { "Nenhum programa foi especificado para" }, { "mail" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "URL mailto incorreta" }, { "URL telnet incorreta" }, { "URL tn3270 incorreta" }, @@ -2120,6 +2131,7 @@ static_const struct translation translation_brazilian_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -2178,7 +2190,6 @@ static_const struct translation translation_bulgarian [] = { { "\315\345 \345 \357\356\347\342\356\353\345\355 \357\360\340\347\345\355 \361\350\354\342\356\353\345\355 \355\350\347" }, { NULL }, { NULL }, - { NULL }, { "\303\360\345\370\352\340 \342 \355\340\361\362\360\356\351\352\350\362\345" }, { "\315\345 \354\356\346\345 \344\340 \361\345 \357\350\370\345 \342\372\342 \364\340\351\353\340 \361 \355\340\361\362\360\356\351\352\350\362\345" }, { NULL }, @@ -2307,6 +2318,8 @@ static_const struct translation translation_bulgarian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\302\360\372\347\352\340(\350)" }, { "\314\340\352\361. \341\360\356\351 \342\360\372\347\352\350" }, { "\314\340\352\361. \341\360\356\351 \342\360\372\347\352\350 \352\372\354 \345\344\350\355 \361\372\360\342\372\360" }, @@ -2668,11 +2681,12 @@ static_const struct translation translation_bulgarian [] = { { NULL }, { NULL }, { "\317\356\371\345\355\361\352\340 \357\360\356\343\360\340\354\340 (% \347\340\354\345\355\377 \340\344\360\345\361\340)" }, - { NULL }, { "\317\360\356\343\360\340\354\340 \347\340 telnet (% \347\340\354\345\355\377 'host' \350\353\350 'host port')" }, - { NULL }, { "\317\360\356\343\360\340\354\340 \347\340 tn3270 (% \347\340\354\345\355\377 'host' \350\353\350 'host port')" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "\317\360\356\343\360\340\354\350 \347\340 \357\356\371\340 \350 telnet" }, { NULL }, { "\315\377\354\340 \357\360\356\343\360\340\354\340" }, @@ -2682,6 +2696,7 @@ static_const struct translation translation_bulgarian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "\315\345\342\340\353\350\344\345\355 \340\344\360\345\361 mailto:" }, { "\315\345\342\340\353\350\344\345\355 \340\344\360\345\361 telnet" }, { "\315\345\342\340\353\350\344\345\355 \340\344\360\345\361 tn3270" }, @@ -2882,6 +2897,7 @@ static_const struct translation translation_bulgarian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, }; static_const struct translation translation_catalan [] = { @@ -2899,7 +2915,6 @@ static_const struct translation translation_catalan [] = { { "No s'hi permeten cadenes buides" }, { NULL }, { NULL }, - { NULL }, { "Error de configuraci\363" }, { "No ha estat possible escriure en l'arxiu de configuraci\363" }, { NULL }, @@ -3028,6 +3043,8 @@ static_const struct translation translation_catalan [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Connexions" }, { "M\340xim de connexions" }, { "M\340xim de connexions a una m\340quina" }, @@ -3389,20 +3406,22 @@ static_const struct translation translation_catalan [] = { { "P\340gina inicial" }, { "Calibratge" }, { "Programa de correu (% \351s substitu\357t per l'adre\347a)" }, - { NULL }, { "Programa de telnet (% \351s substitu\357t per \"host\" o per \"host port\")" }, - { NULL }, { "Programa tn3270 (% \351s substitu\357t per \"host\" o per \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Programes de correu i de telnet" }, { NULL }, { "Cap programa" }, { "No hi ha cap programa especificat per a" }, { "correu" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Adre\347a de correu incorrecta" }, { "Adre\347a de telnet incorrecta" }, { "Adre\347a de tn3270 incorrecta" }, @@ -3558,6 +3577,7 @@ static_const struct translation translation_catalan [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -3620,7 +3640,6 @@ static_const struct translation translation_croatian [] = { { "Prazni niz znakova nije dozvoljen" }, { NULL }, { NULL }, - { NULL }, { "Gre\271ka u konfiguraciji" }, { "Ne mogu pisati u konfiguracijsku datoteku" }, { NULL }, @@ -3749,6 +3768,8 @@ static_const struct translation translation_croatian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Veze" }, { "Maksimanlno veza" }, { "Maksimalno veza na jedno ra\350unalo" }, @@ -4110,20 +4131,22 @@ static_const struct translation translation_croatian [] = { { "Polazna stranica" }, { "Kalibracija" }, { "Mail program (% \346e biti zamijenjeno adresom)" }, - { NULL }, { "Telnet program (% \346e se zamijeniti sa \"host\" ili \"host port\")" }, - { NULL }, { "Tn3270 program (% \346e biti zamijenjeno sa \"ra\350unalo\" ili \"ra\350unalo port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Mail i telnet programi" }, { NULL }, { "Nema programa" }, { "Nema programa za" }, { "email" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Neispravan mailto url" }, { "Neispravan telnet url" }, { "Neispravan tn3270 url" }, @@ -4279,6 +4302,7 @@ static_const struct translation translation_croatian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "T" }, { "O" }, { NULL }, @@ -4340,7 +4364,6 @@ static_const struct translation translation_czech [] = { { "Chybn\375 \370et\354zec" }, { "Mus\355\271 zadat n\354jak\375 text!" }, { "Chybn\341 IP addresa" }, - { "Chyn\341 syntax IP adresy" }, { "Nemohu pou\276\355t lok\341ln\355 IP adresu" }, { "Chyba v konfiguraci" }, { "Nem\371\276u zapisovat do konfigura\350n\355ho souboru" }, @@ -4470,6 +4493,8 @@ static_const struct translation translation_czech [] = { { "Soubor m\341 \271patn\375 form\341t" }, { "Chyba p\370i inicializaci vestav\354n\375ch certifik\341t\371" }, { "selhalo" }, + { "DNS nastaven\355" }, + { "DNS p\370es HTTPS (host nebo url)" }, { "Spojen\355" }, { "Maxim\341ln\354 spojen\355" }, { "Maxim\341ln\354 spojen\355 k jednomu stroji" }, @@ -4831,20 +4856,22 @@ static_const struct translation translation_czech [] = { { "Dom\341c\355 str\341nka" }, { "Kalibrace" }, { "Program pro mail (% je nahrazeno adresou)" }, - { "Shell pro spou\271t\354n\355 extern\355ch p\370\355kaz\371 (% je nahrazeno p\370\355kazem)" }, { "Program pro telnet (% je nahrazeno jm\351nem stroje a p\370\355padn\354 portem)" }, - { "Program pro magnet (% je nahrazeno URL)" }, { "Program pro tn3270 (% je nahrazeno jm\351nem stroje a p\370\355padn\354 portem)" }, { "Program pro mms (% je nahrazeno URL)" }, + { "Program pro magnet (% je nahrazeno URL)" }, + { "Program pro gopher (% je nahrazeno URL)" }, + { "Shell pro spou\271t\354n\355 extern\355ch p\370\355kaz\371 (% je nahrazeno p\370\355kazem)" }, { "Programy pro mail a telnet" }, { "Programy pro mail, telnet a shell" }, { "\256\341dn\375 program" }, { "Nen\355 zad\341n \276\341dn\375 program pro" }, { "mail" }, { "telnet" }, - { "magnet" }, { "tn3270" }, { "mms" }, + { "magnet" }, + { "gopher" }, { "\251patn\351 mailto url" }, { "\251patn\351 telnet url" }, { "\251patn\351 tn3270 url" }, @@ -4997,6 +5024,7 @@ static_const struct translation translation_czech [] = { { "I" }, { "P" }, { "L" }, + { "D" }, { "H" }, { "F" }, { "M" }, @@ -5062,7 +5090,6 @@ static_const struct translation translation_danish [] = { { "Tom tekststreng ikke tilladt" }, { NULL }, { NULL }, - { NULL }, { "Konfigurationsfejl" }, { "Kan ikke skrive til konfigurationsfil" }, { NULL }, @@ -5191,6 +5218,8 @@ static_const struct translation translation_danish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Forbindelser" }, { "Max forbindelser" }, { "Max forbindelser til en v\346rt" }, @@ -5552,20 +5581,22 @@ static_const struct translation translation_danish [] = { { "Hjemmeside" }, { "Kalibrering" }, { "Epostprogram (% erstattes med adresse)" }, - { NULL }, { "Program til fjernlogin (% erstattes med \"v\346rt\" eller \"v\346rt port\")" }, - { NULL }, { "Tn3270-program (% erstattes med \"v\346rt\" eller \"v\346rt port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Program til epost og fjernlogin" }, { NULL }, { "Intet program" }, { "Intet program angivet for" }, { "epost" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Fejl i mailto URL" }, { "Fejl i telnet URL" }, { "Fejl i tn3270 URL" }, @@ -5721,6 +5752,7 @@ static_const struct translation translation_danish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -5783,7 +5815,6 @@ static_const struct translation translation_dutch [] = { { "Lege string niet toegestaan" }, { NULL }, { NULL }, - { NULL }, { "Configuratie fout" }, { "Niet mogelijk om naar het configuratiebestand te schrijven" }, { NULL }, @@ -5912,6 +5943,8 @@ static_const struct translation translation_dutch [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Verbindingen" }, { "Max verbindingen" }, { "Max verbindingen naar \351\351n host" }, @@ -6273,20 +6306,22 @@ static_const struct translation translation_dutch [] = { { NULL }, { NULL }, { "Mail programma (% is vervangen met adres)" }, - { NULL }, { "Telnet programma (% is vervangen met \"host\" of \"host port\")" }, - { NULL }, { "Tn3270 programma (% is vervangen met \"host\" of \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Mail en telnet programma's" }, { NULL }, { "Geen programma" }, { "Geen programma gespecificieerd voor" }, { "mail" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Onjuiste mailto url" }, { "Onjuiste telnet url" }, { "Onjuiste tn3270 url" }, @@ -6446,6 +6481,7 @@ static_const struct translation translation_dutch [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -6503,7 +6539,6 @@ static_const struct translation translation_english [] = { { "Bad string" }, { "Empty string not allowed" }, { "Bad IP address" }, - { "Invalid IP address syntax" }, { "Unable to use local IP address" }, { "Config error" }, { "Unable to write to config file" }, @@ -6633,6 +6668,8 @@ static_const struct translation translation_english [] = { { "The file has invalid format" }, { "Error initializing built-in certificates" }, { "failed" }, + { "DNS options" }, + { "DNS over HTTPS (host or url)" }, { "Connections" }, { "Max connections" }, { "Max connections to one host" }, @@ -6994,20 +7031,22 @@ static_const struct translation translation_english [] = { { "Home page" }, { "Calibration" }, { "Mail program (% is replaced with address)" }, - { "Shell for executing external commands (% is replaced with command)" }, { "Telnet program (% is replaced with \"host\" or \"host port\")" }, - { "Magnet program (% is replaced with URL)" }, { "Tn3270 program (% is replaced with \"host\" or \"host port\")" }, { "MMS program (% is replaced with URL)" }, + { "Magnet program (% is replaced with URL)" }, + { "Goher program (% is replaced with URL)" }, + { "Shell for executing external commands (% is replaced with command)" }, { "Mail and telnet programs" }, { "Mail, telnet and shell programs" }, { "No program" }, { "No program specified for" }, { "mail" }, { "telnet" }, - { "magnet" }, { "tn3270" }, { "mms" }, + { "magnet" }, + { "gopher" }, { "Bad mailto url" }, { "Bad telnet url" }, { "Bad tn3270 url" }, @@ -7160,6 +7199,7 @@ static_const struct translation translation_english [] = { { "I" }, { "P" }, { "L" }, + { "D" }, { "H" }, { "F" }, { "S" }, @@ -7225,7 +7265,6 @@ static_const struct translation translation_estonian [] = { { "T\374hi string pole lubatud" }, { NULL }, { NULL }, - { NULL }, { "Konfiguratsiooni viga" }, { "Ei saa kirjutada konfiguratsioonifaili" }, { NULL }, @@ -7354,6 +7393,8 @@ static_const struct translation translation_estonian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\334hendused" }, { "Maksimaalselt \374hendusi" }, { "Maksimaalselt \374hendusi \374hele hostile" }, @@ -7715,11 +7756,12 @@ static_const struct translation translation_estonian [] = { { "Kodulehek\374lg" }, { "Kalibreerimine" }, { "Mailiprogramm (% asendatakse aadressiga)" }, - { "Shell v\344liste programmide k\344ivitamiseks (% asendatakse k\344suga)" }, { "Telneti programm (% asendatakse \"host\" v\365i \"host port\")" }, - { NULL }, { "Tn3270 programm (% asendatakse \"host\" v\365i \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { "Shell v\344liste programmide k\344ivitamiseks (% asendatakse k\344suga)" }, { "Maili ja telneti programmid" }, { "Maili, telneti ja shelli programmid" }, { "Pole programmi" }, @@ -7729,6 +7771,7 @@ static_const struct translation translation_estonian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "Vigane mailto url" }, { "Vigane telnet url" }, { "Vigane tn3270 url" }, @@ -7884,6 +7927,7 @@ static_const struct translation translation_estonian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "D" }, { NULL }, @@ -7946,7 +7990,6 @@ static_const struct translation translation_finnish [] = { { "Tyhj\344 merkkijono ei sallittu" }, { NULL }, { NULL }, - { NULL }, { "Asetuksissa virhe" }, { "Asetustiedoston kirjoitus ei onnistu" }, { NULL }, @@ -8075,6 +8118,8 @@ static_const struct translation translation_finnish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Yhteydet" }, { "Yhteyksien maksimilkm" }, { "Yhteyksien maksimilkm yhteen kohteeseen" }, @@ -8436,20 +8481,22 @@ static_const struct translation translation_finnish [] = { { "Kotisivu" }, { "Kalibrointi" }, { "S\344hk\366postiohjelma (% korvataan osoitteella)" }, - { NULL }, { "Telnet-ohjelma (% korvataan \"osoitteella\" tai \"portilla\")" }, - { NULL }, { "Tn3270-ohjelma (% korvataan \"osoitteella\" tai \"portilla\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "S\344hk\366posti- tai telnetohjelmat" }, { NULL }, { "Ei ohjelmaa" }, { "Ei ohjelmaa osoitettu" }, { "s\344hk\366posti" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Laiton s\344hk\366posti-URL" }, { "Laiton telnet-URL" }, { "Laiton tn3270-URL" }, @@ -8605,6 +8652,7 @@ static_const struct translation translation_finnish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "A" }, { NULL }, @@ -8667,7 +8715,6 @@ static_const struct translation translation_french [] = { { "Saisie obligatoire" }, { NULL }, { NULL }, - { NULL }, { "Erreur de configuration" }, { "Impossible d'\351crire la configuration" }, { NULL }, @@ -8796,6 +8843,8 @@ static_const struct translation translation_french [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Connexions" }, { "Nombre maximum de connexions" }, { "Nombre maximum de connexions \340 un serveur" }, @@ -9157,20 +9206,22 @@ static_const struct translation translation_french [] = { { "Page d'accueil" }, { "Calibration" }, { "Programme E-Mail (% = adresse)" }, - { "Programme Shell (% = commande)" }, { "Programme Telnet (% = port h\364te)" }, - { NULL }, { "Programme TN3270 (% = port h\364te)" }, { "Programme MMS (% = URL)" }, + { NULL }, + { NULL }, + { "Programme Shell (% = commande)" }, { "Clients e-mail/telnet" }, { "Clients e-mail/telnet/shell" }, { "Pas de programme" }, { "Aucun programme n'est d\351fini pour " }, { "e-mail" }, { "Telnet" }, - { NULL }, { "TN3270" }, { "mms" }, + { NULL }, + { NULL }, { "Adresse e-mail incorrecte" }, { "Adresse Telnet incorrecte" }, { "Adresse TN3270 incorrecte" }, @@ -9330,6 +9381,7 @@ static_const struct translation translation_french [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "E" }, { "A" }, @@ -9388,7 +9440,6 @@ static_const struct translation translation_galician [] = { { "Non se permite unha cadea baleira" }, { NULL }, { NULL }, - { NULL }, { "Erro de configuraci\363n" }, { "Non se puido escribir no ficheiro de configuraci\363n" }, { NULL }, @@ -9517,6 +9568,8 @@ static_const struct translation translation_galician [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Conexi\363ns" }, { "M\341ximo de conexi\363ns" }, { "M\341ximo de conexi\363ns a unha m\341quina" }, @@ -9878,20 +9931,22 @@ static_const struct translation translation_galician [] = { { "P\341xina de inicio" }, { "Calibrar" }, { "Programa de correo (% \351 remprazado pola direcci\363n)" }, - { NULL }, { "Programa de telnet (% \351 remprazado por \"m\341quina\" ou \"m\341quina porto\")" }, - { NULL }, { "Programa de Tn3270 (% \351 remprazado por \"m\341quina\" ou \"m\341quina porto\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Programas de correo e telnet" }, { NULL }, { "Sen programa" }, { "Sen programa especificado para" }, { "correo" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "URL mailto err\363nea" }, { "URL telnet err\363nea" }, { "URL tn3270 err\363nea" }, @@ -10047,6 +10102,7 @@ static_const struct translation translation_galician [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "M" }, { NULL }, @@ -10109,7 +10165,6 @@ static_const struct translation translation_german [] = { { "Werteingabe erforderlich" }, { NULL }, { NULL }, - { NULL }, { "Konfigurationsfehler" }, { "Kann Konfigurationsdatei nicht schreiben" }, { NULL }, @@ -10238,6 +10293,8 @@ static_const struct translation translation_german [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Verbindungen" }, { "Max. Verbindungen" }, { "Max. Verbindungen zu einem Server" }, @@ -10316,7 +10373,7 @@ static_const struct translation translation_german [] = { { NULL }, { NULL }, { NULL }, - { "HTML Sicherheit" }, + { "Speichere HTML Optionen" }, { "Zeichensatz" }, { NULL }, { "Cache" }, @@ -10599,20 +10656,22 @@ static_const struct translation translation_german [] = { { "Homepage" }, { "Kalibration" }, { "Mail-Programm (% wird mit Email-Addresse ersetzt)" }, - { "Shell-Programm f\374r externe Aufrufe (% wird mit Kommando ersetzt)" }, { "Telnet-Programm (% wird mit \"host\" oder \"host port\" ersetzt)" }, - { NULL }, { "TN3270-Programm (% wird mit \"host\" oder \"host port\" ersetzt)" }, { NULL }, + { NULL }, + { NULL }, + { "Shell-Programm f\374r externe Aufrufe (% wird mit Kommando ersetzt)" }, { "Mail-/Telnet-Programme" }, { "Mail-/Telnet-/Shell-Programme" }, { "Kein Programm" }, { "Programm nicht definiert f\374r " }, { "Mail" }, { "Telnet" }, - { NULL }, { "TN3270" }, { NULL }, + { NULL }, + { NULL }, { "fehlerhafte Mailadresse" }, { "fehlerhafte Telnetadresse" }, { "fehlerhafte TN3270-Adresse" }, @@ -10768,6 +10827,7 @@ static_const struct translation translation_german [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -10830,7 +10890,6 @@ static_const struct translation translation_greek [] = { { "\304\345\355 \345\360\351\364\361\335\360\345\364\341\351 \352\345\355\374 \341\353\366\341\361\351\350\354\347\364\351\352\374" }, { NULL }, { NULL }, - { NULL }, { "\323\366\334\353\354\341 \361\365\350\354\337\363\345\371\355" }, { "\301\344\375\355\341\364\347 \347 \345\343\343\361\341\366\336 \363\364\357 \341\361\367\345\337\357 \361\365\350\354\337\363\345\371\355" }, { NULL }, @@ -10959,6 +11018,8 @@ static_const struct translation translation_greek [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\323\365\355\344\335\363\345\351\362" }, { "\314\335\343\351\363\364\357\362 \341\361\351\350\354\374\362 \363\365\355\344\335\363\345\371\355" }, { "\314\335\343\351\363\364\357\362 \341\361\351\350\354\374\362 \363\365\355\344\335\363\345\371\355 \363\345 \335\355\341 \345\356\365\360\347\361\345\364\347\364\336" }, @@ -11320,20 +11381,22 @@ static_const struct translation translation_greek [] = { { NULL }, { NULL }, { "\320\361\374\343\361\341\354\354\341 \341\353\353\347\353\357\343\361\341\366\337\341\362 (\364\357 % \341\355\364\351\352\341\350\337\363\364\341\364\341\351 \354\345 \364\347 \344\351\345\375\350\365\355\363\347)" }, - { NULL }, { "\320\361\374\343\361\341\354\354\341 telnet (\364\357 % \341\355\364\351\352\341\350\337\363\364\341\364\341\351 \354\345 \"\345\356\365\360\347\361\345\364\347\364\336\362\" \336 \"\345\356\365\360\347\361\345\364\347\364\336\362 \350\375\361\341\")" }, - { NULL }, { "\320\361\374\343\361\341\354\354\341 Tn3270 (\364\357 % \341\355\364\351\352\341\350\337\363\364\341\364\341\351 \354\345 \"\345\356\365\360\347\361\345\364\347\364\336\362\" \336 \"\345\356\365\360\347\361\345\364\347\364\336\362 \350\375\361\341\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "\320\361\357\343\361\334\354\354\341\364\341 \341\353\353\347\353\357\343\361\341\366\337\341\362 \352\341\351 telnet" }, { NULL }, { "\304\345\355 \365\360\334\361\367\345\351 \360\361\374\343\361\341\354\354\341" }, { "\304\345\355 \352\341\350\357\361\337\363\364\347\352\345 \360\361\374\343\361\341\354\354\341 \343\351\341" }, { "\341\353\353\347\353\357\343\361\341\366\337\341" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "\305\363\366\341\353\354\335\355\357 URL mailto" }, { "\305\363\366\341\353\354\335\355\357 URL telnet" }, { "\305\363\366\341\353\354\335\355\357 URL tn3270" }, @@ -11493,6 +11556,7 @@ static_const struct translation translation_greek [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -11551,7 +11615,6 @@ static_const struct translation translation_hungarian [] = { { "\334res sz\366veg nem enged\351lyezett" }, { NULL }, { NULL }, - { NULL }, { "Be\341ll\355t\341si hiba" }, { "Nem \355rhat\363 a konfigur\341ci\363s f\341jl" }, { NULL }, @@ -11680,6 +11743,8 @@ static_const struct translation translation_hungarian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Kapcsolatok" }, { "Maxim\341lis kapcsolatok" }, { "Maxim\341lis kapcsolatok egy kiszolg\341l\363hoz" }, @@ -12041,20 +12106,22 @@ static_const struct translation translation_hungarian [] = { { "Honlap" }, { "Kalibr\341ci\363" }, { "Levelez\365 program (% hely\351re \355rd be a c\355med)" }, - { NULL }, { "Telnet program (% hely\351re \355rd be \'kiszolg\341l\363\' vagy \'kiszolg\341l\363 port\')" }, - { NULL }, { "Tn3270 program (% hely\351re \355rd be \'kiszolg\341l\363\' vagy \'kiszolg\341l\363 port\')" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Levelez\365 \351s Telnet programok" }, { NULL }, { "Nincs program" }, { "Nincs program be\341ll\355tva" }, { "levelez\351s" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Hib\341s lev\351lk\374ld\351si URL" }, { "Hib\341s telnet URL" }, { "Hib\341s tn3270 URL" }, @@ -12214,6 +12281,7 @@ static_const struct translation translation_hungarian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "G" }, { "L" }, { "R" }, @@ -12272,7 +12340,6 @@ static_const struct translation translation_icelandic [] = { { "T\363mur strengur \363heimill" }, { NULL }, { NULL }, - { NULL }, { "Uppsetningarvilla" }, { "Villa vi\360 ritun uppsetningarskr\341r" }, { NULL }, @@ -12401,6 +12468,8 @@ static_const struct translation translation_icelandic [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Tengingar" }, { "H\341mark tenginga" }, { "H\341mark tenginga vi\360 hvern mi\360lara" }, @@ -12762,20 +12831,22 @@ static_const struct translation translation_icelandic [] = { { NULL }, { NULL }, { "P\363stforrit (% er skipt \372t fyrir netfang)" }, - { NULL }, { "Telnet forrit (% er skipt \372t fyrir \"mi\360lari\" e\360a \"mi\360lari g\341tt\")" }, - { NULL }, { "Tn3270 forrit (% er skipt \372t fyrir \"mi\360lari\" e\360a \"mi\360lari g\341tt\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "P\363st- og telnet forrit" }, { NULL }, { "Ekkert forrit" }, { "Ekkert forrit skilgreint fyrir" }, { "p\363stur" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Rangt p\363stfang" }, { "Rangt netfang" }, { "Rangt netfang" }, @@ -12935,6 +13006,7 @@ static_const struct translation translation_icelandic [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "Y" }, { "P" }, { "A" }, @@ -12993,7 +13065,6 @@ static_const struct translation translation_italian [] = { { "Stringa vuota non consentita" }, { NULL }, { NULL }, - { NULL }, { "Errore configurazione" }, { "Non posso scrivere il file di configurazione" }, { NULL }, @@ -13122,6 +13193,8 @@ static_const struct translation translation_italian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Connessioni" }, { "Connessioni massime" }, { "Connessioni massime ad un host" }, @@ -13483,20 +13556,22 @@ static_const struct translation translation_italian [] = { { NULL }, { NULL }, { "Programma mail (% e' sostituito con l'indirizzo)" }, - { NULL }, { "Programma telnet (% e' sostituito con \"host\" o \"host port\")" }, - { NULL }, { "Programma Tn3270 (% e' sostituito con \"host\" o \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Programmi mail e telnet" }, { NULL }, { "Nessun programma" }, { "Nessun programma definito per" }, { "mail" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Errato mailto url" }, { "Errato telnet url" }, { "Errato tn3270 url" }, @@ -13656,6 +13731,7 @@ static_const struct translation translation_italian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -13714,7 +13790,6 @@ static_const struct translation translation_lithuanian [] = { { "Eilut\353 negali b\373ti tu\360\350ia" }, { NULL }, { NULL }, - { NULL }, { "Config\373ravimo klaida" }, { "Ne\341manoma \341ra\360yti \341 konfig\373racijos fail\340" }, { NULL }, @@ -13843,6 +13918,8 @@ static_const struct translation translation_lithuanian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Prisijungimai" }, { "Daugiausia prisijungim\370" }, { "Daugiausia prisijungim\370 \341 t\340 pat\341 host\340" }, @@ -14204,20 +14281,22 @@ static_const struct translation translation_lithuanian [] = { { NULL }, { NULL }, { "Pa\360to programa (% pakei\350iamas adresu)" }, - { NULL }, { "Telnet'o programa (% pakei\350iamas \"hostu\" arba \"hostu prievadu\")" }, - { NULL }, { "Tn3270 programa (% pakei\350iamas \"hostu\" arba \"hostu prievadu\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Pa\360to ir telnet'o programos" }, { NULL }, { "N\353r programos" }, { "N\353r programos" }, { "pa\360tui" }, { "telnet'ui" }, - { NULL }, { "tn3270'ui" }, { NULL }, + { NULL }, + { NULL }, { "Blogas pa\360to adresas" }, { "Blogas telnet'o adresas" }, { "Blogas tn3270 adresas" }, @@ -14377,6 +14456,7 @@ static_const struct translation translation_lithuanian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -14435,7 +14515,6 @@ static_const struct translation translation_norwegian [] = { { "Tom tekststreng er ikke tillatt" }, { NULL }, { NULL }, - { NULL }, { "Konfigurasjonsfeil" }, { "Kan ikke skrive til konfigurasjonsfil" }, { NULL }, @@ -14564,6 +14643,8 @@ static_const struct translation translation_norwegian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Tilkoblinger" }, { "Maks antall tilkoblinger" }, { "Maks antall tilkoblinger per vert" }, @@ -14925,20 +15006,22 @@ static_const struct translation translation_norwegian [] = { { "Hjemmeside" }, { "Kalibrering" }, { "E-brevklient (% erstattes med adresse)" }, - { "Skall" }, { "Telnetklient (% erstattes med \"vert\" eller \"vert port\")" }, - { NULL }, { "Tn3270-program (% erstattes med \"vert\" eller \"vert port\")" }, { "MMS-program (% erstattes med nettadresse)" }, + { NULL }, + { NULL }, + { "Skall" }, { "Program for e-brev og fjerninnlogging" }, { "Program for e-brev, fjerninnlogging og skall" }, { "Ingen program" }, { "Ingen program er spesifisert" }, { "e-brev" }, { "telnet" }, - { NULL }, { "tn3270" }, { "mms" }, + { NULL }, + { NULL }, { "Feil i \"mailto\"-adresse" }, { "Feil i \"telnet\"-adresse" }, { "Feil i \"tn3270\"-adresse" }, @@ -15094,6 +15177,7 @@ static_const struct translation translation_norwegian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -15155,7 +15239,6 @@ static_const struct translation translation_polish [] = { { "Nieprawid\263owe wyra\277enie" }, { "Musisz wpisa\346 jakie\266 wyra\277enie" }, { "B\263\352dny adres IP" }, - { "B\263\352dna sk\263adnia adresu IP" }, { "Nie mo\277na u\277y\346 lokalnego adresu IP" }, { "B\263\261d konfiguracji" }, { "Nie mo\277na zapisa\346 do pliku konfiguracyjnego" }, @@ -15285,6 +15368,8 @@ static_const struct translation translation_polish [] = { { "Plik ma b\263\352dny format" }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Po\263\261czenia" }, { "Maksymalna liczba po\263\261cze\361" }, { "Maksymalna liczba po\263\261cze\361 z jednym serwerem" }, @@ -15646,20 +15731,22 @@ static_const struct translation translation_polish [] = { { "Strona domowa" }, { "Kalibracja" }, { "Program pocztowy (% jest zast\352powany przez adres e-mail)" }, - { "Program pow\263oki" }, { "Program us\263ugi Telnet (% jest zast\352powany przez \"host\" lub przez \"host port\")" }, - { "Program Magnet (% jest zast\352powany przez URL)" }, { "Program Tn3270 (% jest zast\352powany przez \"host\" lub przez \"host port\")" }, { "Program MMS (% jest zast\352powany przez URL)" }, + { "Program Magnet (% jest zast\352powany przez URL)" }, + { NULL }, + { "Program pow\263oki" }, { "Obs\263uga poczty i us\263ugi Telnet" }, { "Obs\263uga poczty, us\263ugi Telnet i pow\263oki" }, { "Nie okre\266lono programu" }, { "Nie okre\266lono programu do obs\263ugi" }, { "poczty" }, { "telneta" }, - { "magneta" }, { "tn3270" }, { "mms" }, + { "magneta" }, + { NULL }, { "B\263\352dny adres e-mail" }, { "Niew\263a\266ciwy adres serwera dla programu Telnet" }, { "Niew\263a\266ciwy adres serwera dla programu Tn3270" }, @@ -15812,6 +15899,7 @@ static_const struct translation translation_polish [] = { { "I" }, { "P" }, { "L" }, + { NULL }, { "H" }, { "F" }, { "S" }, @@ -15877,7 +15965,6 @@ static_const struct translation translation_portuguese [] = { { "N\343o \351 permitida uma sequ\352ncia de caracteres vazia" }, { NULL }, { NULL }, - { NULL }, { "Erro de configura\347\343o" }, { "N\343o posso escrever no arquivo de configura\347\343o" }, { NULL }, @@ -16006,6 +16093,8 @@ static_const struct translation translation_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Conex\365es" }, { NULL }, { NULL }, @@ -16374,6 +16463,7 @@ static_const struct translation translation_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "Nenhum programa" }, { "Nenhum programa foi especificado para" }, { NULL }, @@ -16387,6 +16477,7 @@ static_const struct translation translation_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "Utilizador" }, { "Password" }, { "Introduza Utilizador" }, @@ -16542,6 +16633,7 @@ static_const struct translation translation_portuguese [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "A" }, { "E" }, { NULL }, @@ -16598,7 +16690,6 @@ static_const struct translation translation_romanian [] = { { "\252ir vid neacceptabil" }, { NULL }, { NULL }, - { NULL }, { "Eroare de configurare" }, { "Nu pot s\343 scriu fi\272ierul de configurere" }, { NULL }, @@ -16727,6 +16818,8 @@ static_const struct translation translation_romanian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Conexiuni" }, { "Conexiuni maxime" }, { "Conexiuni maxime la un host" }, @@ -17088,20 +17181,22 @@ static_const struct translation translation_romanian [] = { { NULL }, { NULL }, { "Program de e-mail (% este \356nlocuit cu adresa)" }, - { NULL }, { "Program de telnet (% este \356nlocuit cu \"Host\" ori \"Host port\")" }, - { NULL }, { "Program de Tn3270 (% este \356nlocuit cu \"Host\" ori \"Host port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Programe de e-mail si telnet" }, { NULL }, { "Nici un program" }, { "Program nespecificat pentru" }, { "E-mail" }, { "Telnet" }, - { NULL }, { "Tn3270" }, { NULL }, + { NULL }, + { NULL }, { "URL gre\272it pentru e-mail" }, { "URL gre\272it pentru telnet" }, { "URL gre\272it pentru tn3270" }, @@ -17261,6 +17356,7 @@ static_const struct translation translation_romanian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -17319,7 +17415,6 @@ static_const struct translation translation_russian [] = { { "\360\325\323\324\331\305 \323\324\322\317\313\311 \316\305 \304\317\320\325\323\313\301\300\324\323\321" }, { NULL }, { NULL }, - { NULL }, { "\357\333\311\302\313\301 \316\301\323\324\322\317\312\313\311" }, { "\356\305\327\317\332\315\317\326\316\317 \332\301\320\311\323\301\324\330 \327 \306\301\312\314 \316\301\323\324\322\317\305\313" }, { NULL }, @@ -17448,6 +17543,8 @@ static_const struct translation translation_russian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\363\317\305\304\311\316\305\316\311\321(\311\312)" }, { "\355\301\313\323. \336\311\323\314\317 \323\317\305\304\311\316\305\316\311\312" }, { "\355\301\313\323. \336\311\323\314\317 \323\317\305\304\311\316\305\316\311\312 \313 \317\304\316\317\315\325 \323\305\322\327\305\322\325" }, @@ -17809,11 +17906,12 @@ static_const struct translation translation_russian [] = { { "\344\317\315\301\333\316\321\321 \323\324\322\301\316\311\336\313\301" }, { "\353\301\314\311\302\322\301\303\311\321" }, { "\360\322\317\307\322\301\315\315\301 \317\324\320\322\301\327\313\311 \320\317\336\324\331 (% \332\301\315\305\316\321\305\324\323\321 \316\301 \301\304\322\305\323)" }, - { "\357\302\317\314\317\336\313\301 (shell) \304\314\321 \327\316\305\333\316\311\310 \313\317\315\301\316\304 (% \332\301\315\305\316\321\305\324\323\321 \313\317\315\301\316\304\317\312)" }, { "\360\322\317\307\322\301\315\315\301 telnet (% \332\301\315\305\316\321\305\324\323\321 \316\301 'host' \311\314\311 'host port')" }, - { NULL }, { "\360\322\317\307\322\301\315\315\301 tn3270 (% \332\301\315\305\316\321\305\324\323\321 \316\301 'host' \311\314\311 'host port')" }, { "\360\322\317\307\322\301\315\315\301 \304\314\321 MMS-\320\322\317\324\317\313\317\314\301 (% \332\301\315\305\316\321\305\324\323\321 \316\301 URL)" }, + { NULL }, + { NULL }, + { "\357\302\317\314\317\336\313\301 (shell) \304\314\321 \327\316\305\333\316\311\310 \313\317\315\301\316\304 (% \332\301\315\305\316\321\305\324\323\321 \313\317\315\301\316\304\317\312)" }, { "\360\322\317\307\322\301\315\315\331 \304\314\321 \320\317\336\324\331 \311 telnet'\301" }, { "\360\322\317\307\322\301\315\315\331 \320\317\336\324\331, telnet \311 \317\302\317\314\317\336\313\311" }, { "\356\305\324 \320\322\317\307\322\301\315\315\331" }, @@ -17823,6 +17921,7 @@ static_const struct translation translation_russian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "\356\305\327\305\322\316\331\312 \301\304\322\305\323 mailto:" }, { "\356\305\327\305\322\316\331\312 \301\304\322\305\323 telnet" }, { "\356\305\327\305\322\316\331\312 \301\304\322\305\323 tn3270" }, @@ -18023,6 +18122,7 @@ static_const struct translation translation_russian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, }; static_const struct translation translation_serbian [] = { @@ -18040,7 +18140,6 @@ static_const struct translation translation_serbian [] = { { "\277\340\320\327\335\320 \335\330\341\332\320 \335\330\370\325 \324\336\327\322\336\371\325\335\320" }, { NULL }, { NULL }, - { NULL }, { "\263\340\325\350\332\320 \343 \337\336\324\325\350\320\322\320\372\330\334\320" }, { "\275\325 \334\336\323\343 \324\320 \343\337\330\350\325\334 \324\320\342\336\342\325\332\343 \341\320 \337\336\324\325\350\320\322\320\372\330\334\320" }, { NULL }, @@ -18169,6 +18268,8 @@ static_const struct translation translation_serbian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\277\336\322\325\327\330\322\320\372\320" }, { "\275\320\370\322\330\350\325 \337\336\322\325\327\330\322\320\372\320" }, { "\275\320\370\322\330\350\325 \337\336\322\325\327\330\322\320\372\320 \341\320 \370\325\324\335\330\334 \324\336\334\320\373\330\335\336\334" }, @@ -18530,20 +18631,22 @@ static_const struct translation translation_serbian [] = { { "\264\336\334\320\373\320 \341\342\340\320\335\330\346\320" }, { "\272\320\333\330\321\340\330\341\320\372\325" }, { "\277\340\336\323\340\320\334 \327\320 \337\336\350\342\343 (% \341\325 \327\320\334\325\372\343\370\325 \320\324\340\325\341\336\334)" }, - { "\251\343\341\332\320 \327\320 \330\327\322\340\350\320\322\320\372\325 \341\337\336\371\320\350\372\330\345 \335\320\340\325\324\321\330 (\327\335\320\332 % \373\325 \321\330\342\330 \327\320\334\325\372\325\335 \335\320\340\325\324\321\336\334)" }, { "\277\340\336\323\340\320\334 \327\320 \342\325\333\335\325\342 (% \341\325 \327\320\334\325\372\343\370\325 \335\330\341\332\336\334 \"\324\336\334\320\373\330\335\" \330\333\330 \"\324\336\334\320\373\330\335 \337\336\340\342\")" }, - { NULL }, { "\277\340\336\323\340\320\334 \327\320 tn3270 (% \341\325 \327\320\334\325\372\343\370\325 \335\330\341\332\336\334 \"\324\336\334\320\373\330\335\" \330\333\330 \"\324\336\334\320\373\330\335 \337\336\340\342\")" }, { NULL }, + { NULL }, + { NULL }, + { "\251\343\341\332\320 \327\320 \330\327\322\340\350\320\322\320\372\325 \341\337\336\371\320\350\372\330\345 \335\320\340\325\324\321\330 (\327\335\320\332 % \373\325 \321\330\342\330 \327\320\334\325\372\325\335 \335\320\340\325\324\321\336\334)" }, { "\277\340\336\323\340\320\334\330 \327\320 \337\336\350\342\343 \330 \342\325\333\335\325\342" }, { "\277\340\336\323\340\320\334\330 \327\320 \337\336\350\342\343, \342\325\333\335\325\342 \330 \371\343\341\332\343" }, { "\275\325\334\320 \337\340\336\323\340\320\334\320" }, { "\275\330\370\325 \327\320\324\320\342 \337\340\336\323\340\320\334 \327\320" }, { "\337\336\350\342\343" }, { "\342\325\333\335\325\342" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "\273\336\350 mailto \303\300\273" }, { "\273\336\350 telnet \303\300\273" }, { "\273\336\350 tn3270 \303\300\273" }, @@ -18699,6 +18802,7 @@ static_const struct translation translation_serbian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "\324" }, { "\300" }, { NULL }, @@ -18761,7 +18865,6 @@ static_const struct translation translation_slovak [] = { { "Pr\341zdny re\273azec nie je dovolen\375!" }, { NULL }, { NULL }, - { NULL }, { "Chyba v konfigur\341cii" }, { "Nem\364\276em zapisova\273 do konfig. s\372boru" }, { NULL }, @@ -18890,6 +18993,8 @@ static_const struct translation translation_slovak [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Spojenie" }, { "Maxim\341lny po\350et spojen\355" }, { "Maxim\341lny po\350et spojen\355 na jeden po\350\355ta\350" }, @@ -19251,20 +19356,22 @@ static_const struct translation translation_slovak [] = { { "Domovsk\341 str\341nka" }, { "Kalibr\341cia" }, { "Program pre mail (% je nahradene adresou)" }, - { NULL }, { "Program pre telnet (% je nahradene menom stroje a pr\355padne portom)" }, - { "Program pre magnet (% je nahradene URL)" }, { "Program pre tn3270 (% je je nahradene menom stroje a pr\355padne portom)" }, { "Program pre mms (% je nahradene URL)", }, + { "Program pre magnet (% je nahradene URL)" }, + { NULL }, + { NULL }, { "Programy pre mail a telnet" }, { "Programy pre mail a telnet a shell" }, { "\256iadny program" }, { "Nie je nastaven\375 \276iadny program pre" }, { "mail" }, { "telnet" }, - { "magnet" }, { "tn3270" }, { "mms" }, + { "magnet" }, + { NULL }, { "Chybn\351 mailov\351 URL" }, { " Chybn\351 termin\341love URL (telnet)" }, { " Chybn\351 termin\341love URL (tn3270)" }, @@ -19420,6 +19527,7 @@ static_const struct translation translation_slovak [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "I" }, { NULL }, @@ -19481,7 +19589,6 @@ static_const struct translation translation_spanish [] = { { "Cadena incorrecta" }, { "No se permite cadena vac\355a" }, { "Direcci\363n IP incorrecta" }, - { "Sint\341xis de direcci\363n IP no v\341lida" }, { "Imposible usar direcci\363n IP local" }, { "Error de configuraci\363n" }, { "Imposible escribir en archivo de configuraci\363n" }, @@ -19611,6 +19718,8 @@ static_const struct translation translation_spanish [] = { { "Archivo con formato no v\341lido" }, { "Error al inicializar los certificados incorporados" }, { "Ha fallado" }, + { NULL }, + { NULL }, { "Conexiones" }, { "M\341ximo de conexiones" }, { "M\341ximo de conexiones a una m\341quina" }, @@ -19972,20 +20081,22 @@ static_const struct translation translation_spanish [] = { { "P\341gina de inicio" }, { "Calibraci\363n" }, { "Programa de correo (% se reemplaza por la direcci\363n)" }, - { "Programa shell para ejecutar comandos externos (% se reemplaza por el comando)" }, { "Programa de telnet (% se reemplaza por \"m\341quina\" o \"m\341quina puerto\")" }, - { "Programa magnet (% se reemplaza con URL)" }, { "Programa Tn3270 (% se reemplaza con \"m\341quina\" o \"m\341quina puerto\")" }, { "Programa MMS (% se reemplaza con URL)" }, + { "Programa magnet (% se reemplaza con URL)" }, + { NULL }, + { "Programa shell para ejecutar comandos externos (% se reemplaza por el comando)" }, { "Programas de correo y telnet" }, { "Programas de correo, telnet y shell" }, { "Sin programa" }, { "Sin programa especificado para" }, { "correo" }, { "telnet" }, - { "magnet" }, { "tn3270" }, { "mms" }, + { "magnet" }, + { NULL }, { "Direcci\363n de correo incorrecta" }, { "URL de telnet incorrecta" }, { "URL de TN3270 incorrecta" }, @@ -20145,6 +20256,7 @@ static_const struct translation translation_spanish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "O" }, { "A" }, @@ -20203,7 +20315,6 @@ static_const struct translation translation_swedish [] = { { "Tom str\344ng ej till\345ten" }, { NULL }, { NULL }, - { NULL }, { "Konfigurationsfel" }, { "Kan inte skriva till konfigurationsfilen" }, { NULL }, @@ -20332,6 +20443,8 @@ static_const struct translation translation_swedish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "uppkopplingar" }, { "Max anslutningar" }, { "Max anslutningar till v\344rd" }, @@ -20693,20 +20806,22 @@ static_const struct translation translation_swedish [] = { { NULL }, { NULL }, { "Epostprogram (% ers\344tts med adress)" }, - { NULL }, { "Telnetprogram (% ers\344tts med \"v\344rd\" eller \"v\344rd port\")" }, - { NULL }, { "Tn3270-program (% ers\344tts med \"v\344rd\" eller \"v\344rd port\")" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "Epost- och telnetprogram" }, { NULL }, { "Inget program" }, { "Inget program angett f\366r" }, { "epost" }, { "telnet" }, - { NULL }, { "tn3270" }, { NULL }, + { NULL }, + { NULL }, { "Felaktig mailto-URL" }, { "Felaktig telnet-URL" }, { "Felaktig tn3270-URL" }, @@ -20866,6 +20981,7 @@ static_const struct translation translation_swedish [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "C" }, { "M" }, { "A" }, @@ -20924,7 +21040,6 @@ static_const struct translation translation_swiss_german [] = { { "Werte Igabe erforderlich" }, { NULL }, { NULL }, - { NULL }, { "Konfigurationsfehler" }, { "Cha Konfigurationsdatei n\366d schriebe" }, { NULL }, @@ -21053,6 +21168,8 @@ static_const struct translation translation_swiss_german [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "Verbindige" }, { "Max. Verbindige" }, { "Max. Verbindige zumene Server" }, @@ -21131,7 +21248,7 @@ static_const struct translation translation_swiss_german [] = { { NULL }, { NULL }, { NULL }, - { "HTML Sicherheit" }, + { "Speichere HTML Optionen" }, { "Zeichesatz" }, { NULL }, { "Cache" }, @@ -21414,20 +21531,22 @@ static_const struct translation translation_swiss_german [] = { { "Homepage" }, { "Kalibration" }, { "Mail-Programm (% wird mit Email-Addresse ersetzt)" }, - { "Shell-Programm f\374r externi Ufr\374ef (% wird mit Kommando ersetzt)" }, { "Telnet-Programm (% wird mit \"host\" oder \"host port\" ersetzt)" }, - { NULL }, { "TN3270-Programm (% wird mit \"host\" oder \"host port\" ersetzt)" }, { NULL }, + { NULL }, + { NULL }, + { "Shell-Programm f\374r externi Ufr\374ef (% wird mit Kommando ersetzt)" }, { "Mail-/Telnet-Programme" }, { "Mail-/Telnet-/Shell-Programme" }, { "Keis Programm" }, { "Programm n\366d definiert f\374r " }, { "Mail" }, { "Telnet" }, - { NULL }, { "TN3270" }, { NULL }, + { NULL }, + { NULL }, { "fehlerhafti Mailadresse" }, { "fehlerhafti Telnetadresse" }, { "fehlerhafti TN3270-Adresse" }, @@ -21583,6 +21702,7 @@ static_const struct translation translation_swiss_german [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "J" }, { "O" }, { NULL }, @@ -21644,7 +21764,6 @@ static_const struct translation translation_turkish [] = { { "Hatal\375 dizi" }, { "Bo\376 diziye izin verilmiyor" }, { "Hatal\375 IP adresi" }, - { "Ge\347ersiz IP adresi s\366zdizimi" }, { "Yerel IP adresi kullan\375lam\375yor" }, { "Yap\375land\375rma hatas\375" }, { "Yap\375land\375rma dosyas\375na yaz\375lam\375yor" }, @@ -21774,6 +21893,8 @@ static_const struct translation translation_turkish [] = { { "Dosya bi\347imi ge\347ersiz" }, { "G\366m\374l\374 sertifikalar kullan\375l\375rken hata" }, { "ba\376ar\375s\375z oldu" }, + { NULL }, + { NULL }, { "Ba\360lant\375lar" }, { "En \347ok ba\360lant\375" }, { "Bir makineye en \347ok ba\360lant\375" }, @@ -22135,20 +22256,22 @@ static_const struct translation translation_turkish [] = { { "Ana sayfa" }, { "Kalibrasyon" }, { "Posta program\375 (% adres ile de\360i\376tirilir)" }, - { "D\375\376 komutlar\375 \347al\375\376t\375rmak i\347in kabuk (% kabuk ile de\360i\376tirilir)" }, { "Telnet program\375 (% \"makine\" veya \"makine kap\375s\375\" ile de\360i\376tirilir)" }, - { "M\375knat\375s program\375 (% URL ile de\360i\376tirilir)" }, { "Tn3270 program\375 (% \"makine\" veya \"makine kap\375s\375\" ile de\360i\376tirilir)" }, { "MMS program\375 (% URL ile de\360i\376tirilir)" }, + { "M\375knat\375s program\375 (% URL ile de\360i\376tirilir)" }, + { NULL }, + { "D\375\376 komutlar\375 \347al\375\376t\375rmak i\347in kabuk (% kabuk ile de\360i\376tirilir)" }, { "Posta ve Telnet Programlar\375" }, { "Posta, Telnet ve kabuk Programlar\375" }, { "Program yok" }, { "Program belirlenmemi\376:" }, { "posta" }, { "telnet" }, - { "m\375knat\375s" }, { "tn3270" }, { "mms" }, + { "m\375knat\375s" }, + { NULL }, { "Adrese posta g\366nder" }, { "Hatal\375 Telnet adresi" }, { "Hatal\375 tn3270 adresi" }, @@ -22301,6 +22424,7 @@ static_const struct translation translation_turkish [] = { { "6" }, { "V" }, { "S" }, + { NULL }, { "H" }, { "F" }, { "S" }, @@ -22366,7 +22490,6 @@ static_const struct translation translation_ukrainian [] = { { "\360\317\322\317\326\316\246 \322\321\304\313\311 \316\305\304\317\320\325\323\324\311\315\246" }, { NULL }, { NULL }, - { NULL }, { "\360\317\315\311\314\313\301 \313\317\316\306\246\307\325\322\301\303\246\247" }, { "\356\305 \315\317\326\325 \332\301\320\311\323\301\324\311 \306\301\312\314 \313\317\316\306\246\307\325\322\301\303\246\247" }, { NULL }, @@ -22495,6 +22618,8 @@ static_const struct translation translation_ukrainian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "\372'\244\304\316\301\316\316\321" }, { "\355\301\313\323. \336\311\323\314\317 \332'\244\304\316\301\316\330" }, { "\355\301\313\323. \336\311\323\314\317 \332'\244\304\316\301\316\330 \332 \317\304\316\311\315 \323\305\322\327\305\322\317\315" }, @@ -22856,11 +22981,12 @@ static_const struct translation translation_ukrainian [] = { { NULL }, { NULL }, { "\360\317\333\324\317\327\301 \320\322\317\307\322\301\315\301 (% \332\301\315\246\316\300\244\324\330\323\321 \301\304\322\305\323\317\300)" }, - { NULL }, { "\360\322\317\307\322\301\315\301 telnet (% \332\301\315\246\316\300\244\324\330\323\321 \316\301 'host' \301\302\317 'host port')" }, - { NULL }, { "\360\322\317\307\322\301\315\301 tn3270 (% \332\301\315\246\316\300\244\324\330\323\321 \316\301 'host' \301\302\317 'host port')" }, { NULL }, + { NULL }, + { NULL }, + { NULL }, { "\360\322\317\307\322\301\315\311 \304\314\321 \320\317\333\324\311 \324\301 telnet" }, { NULL }, { "\356\305\315\301\244 \320\322\317\307\322\301\315\311" }, @@ -22870,6 +22996,7 @@ static_const struct translation translation_ukrainian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "\356\305\320\322\301\327\311\314\330\316\301 \301\304\322\305\323\301 mailto:" }, { "\356\305\320\322\301\327\311\314\330\316\301 \301\304\322\305\323\301 telnet" }, { "\356\305\320\322\301\327\311\314\330\316\301 \301\304\322\305\323\301 tn3270" }, @@ -23070,6 +23197,7 @@ static_const struct translation translation_ukrainian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, }; static_const struct translation translation_upper_sorbian [] = { @@ -23087,7 +23215,6 @@ static_const struct translation translation_upper_sorbian [] = { { "Nulowy wuraz njedowoleny" }, { NULL }, { NULL }, - { NULL }, { "Zmylk konfiguracije" }, { "Njem\363\276u do konfiguraciskeje dataje pisa\346" }, { NULL }, @@ -23216,6 +23343,8 @@ static_const struct translation translation_upper_sorbian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, + { NULL }, { "zwiskow" }, { "Maksimalna li\350ba zwiskow" }, { "Maksimalna li\350ba zwiskow z jednym serwerom" }, @@ -23577,11 +23706,12 @@ static_const struct translation translation_upper_sorbian [] = { { "Domjaca strona" }, { "Kalibracija" }, { "Emailowy program (% so z emailowej adresu naruna)" }, - { "Programowy interpreter (% so naruna z p\370ikazom)" }, { "Program za telnet (% naruna so z \"host\" abo \"host port\")" }, - { NULL }, { "Program za Tn3270 (% naruna so z \"host\" abo \"host port\")" }, { NULL }, + { NULL }, + { NULL }, + { "Programowy interpreter (% so naruna z p\370ikazom)" }, { "Elektroniska p\363\271ta a telnet" }, { "Programy za elektronisku p\363\271tu, telnet a komanda" }, { "\256adyn program" }, @@ -23591,6 +23721,7 @@ static_const struct translation translation_upper_sorbian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "Hubjena emailowa adresa" }, { "Hubjena adresa serwera za telnet" }, { "Hubjena adresa serwera za Tn3270" }, @@ -23750,6 +23881,7 @@ static_const struct translation translation_upper_sorbian [] = { { NULL }, { NULL }, { NULL }, + { NULL }, { "P" }, { "C" }, { "S" }, diff --git a/links.1 b/links.1 index 65460e5..c91ab0b 100644 --- a/links.1 +++ b/links.1 @@ -141,11 +141,11 @@ Timeout for connection when trying multiple addresses or when resuming a keepali (default: 3) .TP -\f3-bind-address \f2\f1 +\f3-bind-address \f2\f1 Use a specific local IP address. .TP -\f3-bind-address-ipv6 \f2\f1 +\f3-bind-address-ipv6 \f2\f1 Use a specific local IPv6 address. .TP @@ -156,10 +156,6 @@ Don't use libevent library. \f3-no-openmp\f1 Don't use OpenMP. -.TP -\f3-async-dns \f2<0>/<1>\f1 -Asynchronous DNS resolver on(1)/off(0). - .TP \f3-download-utime \f2<0>/<1>\f1 Set time of downloaded files to last modification time reported by server. @@ -258,6 +254,14 @@ Name of the PEM encoded file with the user certificate for client certificate au \f3-ssl.client-cert-password \f2\f1 Password for the user private key. +.TP +\f3-async-dns \f2<0>/<1>\f1 +Asynchronous DNS resolver on(1)/off(0). + +.TP +\f3-dns-over-https \f2\f1 +DNS over HTTPS url. + .TP \f3-http-bugs.http10 \f2<0>/<1>\f1 (default 0) "1" forces using only HTTP/1.0 protocol. (useful for buggy servers diff --git a/links.h b/links.h index 885d3a4..3f469af 100644 --- a/links.h +++ b/links.h @@ -1181,11 +1181,7 @@ void omp_end(void); /* dns.c */ -#ifdef USE_GETADDRINFO #define MAX_ADDRESSES 64 -#else -#define MAX_ADDRESSES 1 -#endif struct host_address { int af; @@ -1206,6 +1202,22 @@ struct lookup_state { int target_port; }; +struct dnsquery_doh; + +struct dnsquery { +#ifndef THREAD_SAFE_LOOKUP + struct dnsquery *next_in_queue; +#endif + void (*fn)(void *, int); + void *data; + int h; + void **s; + struct dnsquery_doh *doh; + struct lookup_result *addr; + int addr_preference; + unsigned char name[1]; +}; + #ifdef SUPPORT_IPV6 extern int support_ipv6; #else @@ -1216,21 +1228,25 @@ int numeric_ip_address(unsigned char *name, unsigned char address[4]); #ifdef SUPPORT_IPV6 int numeric_ipv6_address(unsigned char *name, unsigned char address[16], unsigned *scope_id); #endif +void add_address(struct lookup_result *host, int af, unsigned char *address, unsigned scope_id, int preference); void rotate_addresses(struct lookup_result *); void do_real_lookup(unsigned char *, int, struct lookup_result *); -int find_host(unsigned char *, struct lookup_result *, void **, void (*)(void *, int), void *); -int find_host_no_cache(unsigned char *, struct lookup_result *, void **, void (*)(void *, int), void *); +void end_dns_lookup(struct dnsquery *, int, uttime); +void find_host_no_cache(unsigned char *, int, struct lookup_result *, void **, void (*)(void *, int), void *); +int find_host_in_cache(unsigned char *, struct lookup_result *, void **, void (*)(void *, int), void *); void kill_dns_request(void **); void dns_prefetch(unsigned char *); -#if MAX_ADDRESSES > 1 void dns_set_priority(unsigned char *, struct host_address *, int); -#endif void dns_clear_host(unsigned char *); unsigned long dns_info(int type); unsigned char *print_address(struct host_address *); int ipv6_full_access(void); void init_dns(void); +/* doh.c */ + +void do_doh_lookup(struct dnsquery *); + /* cache.c */ struct cache_entry { @@ -1300,6 +1316,7 @@ typedef struct { } links_ssl; #endif +#define PRI_DOH 0 #define PRI_MAIN 0 #define PRI_DOWNLOAD 0 #define PRI_FRAME 1 @@ -1350,6 +1367,7 @@ struct connection { off_t est_length; int unrestartable; int no_compress; + int doh; struct remaining_info prg; struct timer *timer; int detached; @@ -1474,6 +1492,7 @@ struct status { list_entry_last }; +int is_noproxy_host(unsigned char *host); int is_noproxy_url(unsigned char *url); unsigned char *get_proxy_string(unsigned char *url); unsigned char *get_proxy(unsigned char *url); @@ -1493,7 +1512,7 @@ void abort_connection(struct connection *c); #define ALLOW_SMB 1 #define ALLOW_FILE 2 #define ALLOW_ALL (ALLOW_SMB | ALLOW_FILE) -void load_url(unsigned char *, unsigned char *, struct status *, int, int, int, int, off_t); +void load_url(unsigned char *, unsigned char *, struct status *, int, int, int, int, int, off_t); void change_connection(struct status *, struct status *, int); void detach_connection(struct status *, off_t, int, int); void abort_all_connections(void); @@ -1698,11 +1717,12 @@ void smb_func(struct connection *); /* mailto.c */ -void magnet_func(struct session *, unsigned char *); void mailto_func(struct session *, unsigned char *); void telnet_func(struct session *, unsigned char *); void tn3270_func(struct session *, unsigned char *); void mms_func(struct session *, unsigned char *); +void magnet_func(struct session *, unsigned char *); +void gopher_func(struct session *, unsigned char *); /* kbd.c */ @@ -3143,6 +3163,10 @@ struct g_object_tag { #define IM_SVG 5 #endif /* #ifdef HAVE_SVG */ +#ifdef HAVE_WEBP +#define IM_WEBP 6 +#endif /* #ifdef HAVE_WEBP */ + #define MEANING_DIMS 0 #define MEANING_AUTOSCALE 1 struct cached_image { @@ -4342,6 +4366,19 @@ void add_svg_version(unsigned char **s, int *l); #endif +/* webp.c */ + +#if defined(G) && defined(HAVE_WEBP) + +void webp_start(struct cached_image *cimg); +void webp_restart(struct cached_image *cimg, unsigned char *data, int length); +void webp_finish(struct cached_image *cimg); +void webp_destroy_decoder(struct cached_image *cimg); + +void add_webp_version(unsigned char **s, int *l); + +#endif + /* img.c */ #ifdef G @@ -4890,7 +4927,6 @@ extern int unrestartable_receive_timeout; extern int timeout_multiple_addresses; extern unsigned char bind_ip_address[16]; extern unsigned char bind_ipv6_address[INET6_ADDRSTRLEN]; -extern int async_lookup; extern int download_utime; extern int max_format_cache_entries; @@ -4943,6 +4979,9 @@ struct ssl_options { extern struct ssl_options ssl_options; +extern int async_lookup; +extern unsigned char dns_over_https[MAX_STR_LEN]; + struct http_header_options { int fake_firefox; int do_not_track; @@ -5153,6 +5192,7 @@ extern struct list_head telnet_prog; extern struct list_head tn3270_prog; extern struct list_head mms_prog; extern struct list_head magnet_prog; +extern struct list_head gopher_prog; unsigned char *get_compress_by_extension(unsigned char *ext, unsigned char *ext_end); unsigned char *get_content_type_by_extension(unsigned char *url); diff --git a/links.wis b/links.wis index 1ae1229..415ac1c 100644 --- a/links.wis +++ b/links.wis @@ -1,7 +1,7 @@ current_pos != ld->list) ld->current_pos->type ^= 4; - rd.n = -1; if (next_in_tree(ld, ld->current_pos) == ld->list) /* already at the bottom */ { draw_to_window(dlg->win, redraw_list_line, &rd); return 0; } + rd.n = -1; ld->current_pos = next_in_tree(ld, ld->current_pos); ld->win_pos++; if (ld->win_pos > ld->n_items - 1) /* scroll down */ diff --git a/mailto.c b/mailto.c index 75cb656..dc4a5d7 100644 --- a/mailto.c +++ b/mailto.c @@ -78,13 +78,6 @@ void tn3270_func(struct session *ses, unsigned char *url) tn_func(ses, url, &tn3270_prog, TEXT_(T_TN3270), TEXT_(T_BAD_TN3270_URL)); } -void magnet_func(struct session *ses, unsigned char *url) -{ - unsigned char *escaped_url = escape_path(url); - prog_func(ses->term, &magnet_prog, escaped_url, TEXT_(T_MAGNET)); - mem_free(escaped_url); -} - void mms_func(struct session *ses, unsigned char *url) { if (check_shell_url(url)) { @@ -93,3 +86,17 @@ void mms_func(struct session *ses, unsigned char *url) } prog_func(ses->term, &mms_prog, url, TEXT_(T_MMS)); } + +void magnet_func(struct session *ses, unsigned char *url) +{ + unsigned char *escaped_url = escape_path(url); + prog_func(ses->term, &magnet_prog, escaped_url, TEXT_(T_MAGNET)); + mem_free(escaped_url); +} + +void gopher_func(struct session *ses, unsigned char *url) +{ + unsigned char *escaped_url = escape_path(url); + prog_func(ses->term, &gopher_prog, escaped_url, TEXT_(T_GOPHER)); + mem_free(escaped_url); +} diff --git a/menu.c b/menu.c index 1037969..762d9d1 100644 --- a/menu.c +++ b/menu.c @@ -217,6 +217,10 @@ static void menu_version(void *term_) #ifdef HAVE_SVG add_to_str(&s, &l, cast_uchar ", "); add_svg_version(&s, &l); +#endif +#ifdef HAVE_WEBP + add_to_str(&s, &l, cast_uchar ", "); + add_webp_version(&s, &l); #endif add_to_str(&s, &l, cast_uchar "\n"); #endif @@ -1664,7 +1668,7 @@ static void dlg_net_options(struct terminal *term, void *xxx, void *yyy) snprint(time_str, 5, receive_timeout); snprint(unrtime_str, 5, unrestartable_receive_timeout); snprint(addrtime_str, 4, timeout_multiple_addresses); - d = mem_calloc(sizeof(struct dialog) + 12 * sizeof(struct dialog_item)); + d = mem_calloc(sizeof(struct dialog) + 11 * sizeof(struct dialog_item)); d->title = TEXT_(T_NETWORK_OPTIONS); d->fn = group_fn; d->udata = (void *)net_msg; @@ -1729,12 +1733,6 @@ static void dlg_net_options(struct terminal *term, void *xxx, void *yyy) d->items[a].dlen = sizeof(bind_ipv6_address); d->items[a++].fn = check_local_ipv6_address; } -#endif -#ifndef NO_ASYNC_LOOKUP - net_msg[a] = TEXT_(T_ASYNC_DNS_LOOKUP); - d->items[a].type = D_CHECKBOX; - d->items[a].data = (unsigned char *)&async_lookup; - d->items[a++].dlen = sizeof(int); #endif net_msg[a] = TEXT_(T_SET_TIME_OF_DOWNLOADED_FILES); d->items[a].type = D_CHECKBOX; @@ -2337,6 +2335,105 @@ static void dlg_ssl_options(struct terminal *term, void *xxx, void *yyy) #endif +static unsigned char * const dns_msg[] = { +#ifndef NO_ASYNC_LOOKUP + TEXT_(T_ASYNC_DNS_LOOKUP), +#endif + TEXT_(T_DNS_OVER_HTTPS_URL), +}; + +static void dns_options_fn(struct dialog_data *dlg) +{ + struct terminal *term = dlg->win->term; + int max = 0, min = 0; + int w, rw; + int i; + int y = 0; + i = 0; +#ifndef NO_ASYNC_LOOKUP + max_group_width(term, dns_msg + i, dlg->items, 1, &max); + min_group_width(term, dns_msg + i, dlg->items, 1, &min); + i++; +#endif + for (; i < dlg->n - 2; i++) { + max_text_width(term, dns_msg[i], &max, AL_LEFT); + min_text_width(term, dns_msg[i], &min, AL_LEFT); + } + max_buttons_width(term, dlg->items + dlg->n - 2, 2, &max); + min_buttons_width(term, dlg->items + dlg->n - 2, 2, &min); + w = dlg->win->term->x * 9 / 10 - 2 * DIALOG_LB; + if (w > max) w = max; + if (w < min) w = min; + if (w > dlg->win->term->x - 2 * DIALOG_LB) w = dlg->win->term->x - 2 * DIALOG_LB; + if (w < 1) w = 1; + rw = 0; + i = 0; +#ifndef NO_ASYNC_LOOKUP + dlg_format_group(dlg, NULL, dns_msg, dlg->items, 1, 0, &y, w, &rw); + y += LL; + i++; +#else + if (!dlg->win->term->spec->braille) y -= LL; +#endif + for (; i < dlg->n - 2; i++) { + dlg_format_text_and_field(dlg, NULL, dns_msg[i], &dlg->items[i], 0, &y, w, &rw, COLOR_DIALOG_TEXT, AL_LEFT); + if (!dlg->win->term->spec->braille) y += LL; + } + dlg_format_buttons(dlg, NULL, dlg->items + dlg->n - 2, 2, 0, &y, w, &rw, AL_CENTER); + w = rw; + dlg->xw = w + 2 * DIALOG_LB; + dlg->yw = y + 2 * DIALOG_TB; + center_dlg(dlg); + draw_dlg(dlg); + y = dlg->y + DIALOG_TB; + y += LL; + i = 0; +#ifndef NO_ASYNC_LOOKUP + dlg_format_group(dlg, term, dns_msg, dlg->items, 1, dlg->x + DIALOG_LB, &y, w, &rw); + y += LL; + i++; +#else + if (!dlg->win->term->spec->braille) y -= LL; +#endif + for (; i < dlg->n - 2; i++) { + dlg_format_text_and_field(dlg, term, dns_msg[i], &dlg->items[i], dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, AL_LEFT); + y += LL; + } + dlg_format_buttons(dlg, term, &dlg->items[dlg->n - 2], 2, dlg->x + DIALOG_LB, &y, w, NULL, AL_CENTER); +} + +static void dlg_dns_options(struct terminal *term, void *xxx, void *yyy) +{ + struct dialog *d; + int a = 0; + d = mem_calloc(sizeof(struct dialog) + 5 * sizeof(struct dialog_item)); + d->title = TEXT_(T_DNS_OPTIONS); + d->fn = dns_options_fn; + d->refresh = refresh_network; +#ifndef NO_ASYNC_LOOKUP + d->items[a].type = D_CHECKBOX; + d->items[a].dlen = sizeof(int); + d->items[a].data = (unsigned char *)&async_lookup; + a++; +#endif + d->items[a].type = D_FIELD; + d->items[a].dlen = MAX_STR_LEN; + d->items[a].data = dns_over_https; + a++; + d->items[a].type = D_BUTTON; + d->items[a].gid = B_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT_(T_OK); + a++; + d->items[a].type = D_BUTTON; + d->items[a].gid = B_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT_(T_CANCEL); + a++; + d->items[a].type = D_END; + do_dialog(term, d, getml(d, NULL)); +} + static unsigned char * const http_labels[] = { TEXT_(T_USE_HTTP_10), TEXT_(T_ALLOW_SERVER_BLACKLIST), TEXT_(T_DO_NOT_SEND_ACCEPT_CHARSET), #ifdef HAVE_ANY_COMPRESSION TEXT_(T_DO_NOT_ADVERTISE_COMPRESSION_SUPPORT), @@ -2638,6 +2735,7 @@ static unsigned char * const prg_msg[] = { TEXT_(T_TN3270_PROG), TEXT_(T_MMS_PROG), TEXT_(T_MAGNET_PROG), + TEXT_(T_GOPHER_PROG), TEXT_(T_SHELL_PROG), cast_uchar "" }; @@ -2660,6 +2758,8 @@ static void netprog_fn(struct dialog_data *dlg) min_text_width(term, prg_msg[a++], &min, AL_LEFT); max_text_width(term, prg_msg[a], &max, AL_LEFT); min_text_width(term, prg_msg[a++], &min, AL_LEFT); + max_text_width(term, prg_msg[a], &max, AL_LEFT); + min_text_width(term, prg_msg[a++], &min, AL_LEFT); #ifdef G if (have_extra_exec()) { max_text_width(term, prg_msg[a], &max, AL_LEFT); @@ -2691,6 +2791,9 @@ static void netprog_fn(struct dialog_data *dlg) dlg_format_text_and_field(dlg, NULL, prg_msg[a], &dlg->items[a], 0, &y, w, &rw, COLOR_DIALOG_TEXT, AL_LEFT); a++; if (!term->spec->braille) y += LL; + dlg_format_text_and_field(dlg, NULL, prg_msg[a], &dlg->items[a], 0, &y, w, &rw, COLOR_DIALOG_TEXT, AL_LEFT); + a++; + if (!term->spec->braille) y += LL; #ifdef G if (have_extra_exec()) { dlg_format_text_and_field(dlg, NULL, prg_msg[a], &dlg->items[a], 0, &y, w, &rw, COLOR_DIALOG_TEXT, AL_LEFT); @@ -2723,6 +2826,9 @@ static void netprog_fn(struct dialog_data *dlg) dlg_format_text_and_field(dlg, term, prg_msg[a], &dlg->items[a], dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, AL_LEFT); a++; if (!term->spec->braille) y += LL; + dlg_format_text_and_field(dlg, term, prg_msg[a], &dlg->items[a], dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, AL_LEFT); + a++; + if (!term->spec->braille) y += LL; #ifdef G if (have_extra_exec()) { dlg_format_text_and_field(dlg, term, prg_msg[a], &dlg->items[a], dlg->x + DIALOG_LB, &y, w, NULL, COLOR_DIALOG_TEXT, AL_LEFT); @@ -2738,7 +2844,7 @@ static void net_programs(struct terminal *term, void *xxx, void *yyy) { struct dialog *d; int a; - d = mem_calloc(sizeof(struct dialog) + 8 * sizeof(struct dialog_item)); + d = mem_calloc(sizeof(struct dialog) + 9 * sizeof(struct dialog_item)); #ifdef G if (have_extra_exec()) d->title = TEXT_(T_MAIL_TELNET_AND_SHELL_PROGRAMS); else @@ -2762,6 +2868,9 @@ static void net_programs(struct terminal *term, void *xxx, void *yyy) d->items[a].type = D_FIELD; d->items[a].dlen = MAX_STR_LEN; d->items[a++].data = get_prog(&magnet_prog); + d->items[a].type = D_FIELD; + d->items[a].dlen = MAX_STR_LEN; + d->items[a++].data = get_prog(&gopher_prog); #ifdef G if (have_extra_exec()) { d->items[a].type = D_FIELD; @@ -3662,6 +3771,7 @@ static void free_fonts(void *fonts_) static int select_font(struct dialog_data *dlg, struct dialog_item_data *di) { + unsigned char * decc_volatile empty = cast_uchar ""; struct list_of_fonts *fonts; int n_fonts; int i; @@ -3684,11 +3794,11 @@ static int select_font(struct dialog_data *dlg, struct dialog_item_data *di) mi = new_menu(MENU_FREE_ITEMS | MENU_FONT_LIST | (bold * MENU_FONT_LIST_BOLD) | (monospaced * MENU_FONT_LIST_MONO)); - add_to_menu(&mi, TEXT_(T_BUILT_IN_FONT), cast_uchar "", cast_uchar "", font_selected, cast_uchar "", 0, 0); + add_to_menu(&mi, TEXT_(T_BUILT_IN_FONT), empty, empty, font_selected, empty, 0, 0); for (i = 0; i < n_fonts; i++) { if (!strcmp(cast_const_char fonts[i].file, cast_const_char di->cdata)) current_font = i + 1; - add_to_menu(&mi, fonts[i].name, cast_uchar "", cast_uchar "", font_selected, fonts[i].file, 0, i + 1); + add_to_menu(&mi, fonts[i].name, empty, empty, font_selected, fonts[i].file, 0, i + 1); } do_menu_selected(dlg->win->term, mi, di->cdata, current_font, free_fonts, fonts); @@ -4165,6 +4275,7 @@ static_const struct menu_item net_options_menu[] = { #ifdef HAVE_SSL_CERTIFICATES { TEXT_(T_SSL_OPTIONS), cast_uchar "", TEXT_(T_HK_SSL_OPTIONS), dlg_ssl_options, NULL, 0, 0 }, #endif + { TEXT_(T_DNS_OPTIONS), cast_uchar "", TEXT_(T_HK_DNS_OPTIONS), dlg_dns_options, NULL, 0, 0 }, { TEXT_(T_HTTP_OPTIONS), cast_uchar "", TEXT_(T_HK_HTTP_OPTIONS), dlg_http_options, NULL, 0, 0 }, { TEXT_(T_FTP_OPTIONS), cast_uchar "", TEXT_(T_HK_FTP_OPTIONS), dlg_ftp_options, NULL, 0, 0 }, #ifndef DISABLE_SMB @@ -4181,6 +4292,7 @@ static_const struct menu_item net_options_ipv6_menu[] = { #ifdef HAVE_SSL_CERTIFICATES { TEXT_(T_SSL_OPTIONS), cast_uchar "", TEXT_(T_HK_SSL_OPTIONS), dlg_ssl_options, NULL, 0, 0 }, #endif + { TEXT_(T_DNS_OPTIONS), cast_uchar "", TEXT_(T_HK_DNS_OPTIONS), dlg_dns_options, NULL, 0, 0 }, { TEXT_(T_HTTP_OPTIONS), cast_uchar "", TEXT_(T_HK_HTTP_OPTIONS), dlg_http_options, NULL, 0, 0 }, { TEXT_(T_FTP_OPTIONS), cast_uchar "", TEXT_(T_HK_FTP_OPTIONS), dlg_ftp_options, NULL, 0, 0 }, #ifndef DISABLE_SMB diff --git a/objreq.c b/objreq.c index 5704815..e217376 100644 --- a/objreq.c +++ b/objreq.c @@ -109,7 +109,7 @@ static int auth_ok(struct dialog_data *dlg, struct dialog_item_data *item) mem_free(passwd); rq->hold = 0; change_connection(&rq->stat, NULL, PRI_CANCEL); - load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_RELOAD, 0, 0, 0); + load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_RELOAD, 0, 0, 0, 0); } cancel_dialog(dlg, item); return 0; @@ -198,7 +198,7 @@ static void cert_action(struct object_request *rq, int yes) if (yes > 0) { rq->hold = 0; change_connection(&rq->stat, NULL, PRI_CANCEL); - load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_CACHE, 0, 0, 0); + load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_CACHE, 0, 0, 0, 0); } else { rq->hold = 0; rq->dont_print_error = 1; @@ -319,7 +319,7 @@ void request_object(struct terminal *term, unsigned char *url, unsigned char *pr if (rqp) *rqp = rq; rq->count = obj_req_count++; add_to_list(requests, rq); - load_url(url, prev_url, &rq->stat, pri, cache, 0, allow_flags, 0); + load_url(url, prev_url, &rq->stat, pri, cache, 0, 0, allow_flags, 0); } static void set_ce_internal(struct object_request *rq) @@ -368,7 +368,7 @@ static void objreq_end(struct status *stat, void *data) allow_flags = get_allow_flags(rq->url); mem_free(rq->url); rq->url = u; - load_url(u, rq->prev_url, &rq->stat, rq->pri, cache, 0, allow_flags, 0); + load_url(u, rq->prev_url, &rq->stat, rq->pri, cache, 0, 0, allow_flags, 0); return; } else { maxrd: @@ -383,7 +383,7 @@ static void objreq_end(struct status *stat, void *data) mem_free(realm); if (rq->redirect_cnt++ >= MAX_REDIRECTS) goto maxrd; change_connection(stat, NULL, PRI_CANCEL); - load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_RELOAD, 0, 0, 0); + load_url(rq->url, rq->prev_url, &rq->stat, rq->pri, NC_RELOAD, 0, 0, 0, 0); return; } user = get_user_name(rq->url); diff --git a/os_dep.c b/os_dep.c index 8ebf95c..5fe3105 100644 --- a/os_dep.c +++ b/os_dep.c @@ -2738,7 +2738,8 @@ int get_input_handle(void) static unsigned char *is_on_linux_console(void) { static unsigned char tty_name[MAX_STR_LEN]; - int r = readlink("/proc/self/fd/0", cast_char tty_name, sizeof tty_name); + int r; + EINTRLOOP(r, (int)readlink("/proc/self/fd/0", cast_char tty_name, sizeof tty_name)); if (r >= 1 && r < (int)sizeof(tty_name)) { #define pfx1 "/dev/tty" #define pfx2 "/dev/vc/" diff --git a/sched.c b/sched.c index 81f1e04..b04a1ca 100644 --- a/sched.c +++ b/sched.c @@ -236,11 +236,13 @@ static void free_connection_data(struct connection *c) c->info = NULL; } clear_connection_timeout(c); - if (--active_connections < 0) { - internal_error("active connections underflow"); - active_connections = 0; + if (!c->doh) { + if (--active_connections < 0) { + internal_error("active connections underflow"); + active_connections = 0; + } } - if (c->state != S_WAIT) { + if (c->state != S_WAIT && !c->doh) { if ((h = is_host_on_list(c))) { if (!--h->conn) { del_from_list(h); @@ -464,9 +466,8 @@ static int try_to_suspend_connection(struct connection *c, unsigned char *ho) return -1; } -int is_noproxy_url(unsigned char *url) +int is_noproxy_host(unsigned char *host) { - unsigned char *host = get_host_name(url); if (!proxies.only_proxies) { unsigned char *np = proxies.no_proxy; int host_l = (int)strlen(cast_const_char host); @@ -478,7 +479,6 @@ int is_noproxy_url(unsigned char *url) goto no_match; if (casecmp(np, host + (host_l - l), l)) goto no_match; - mem_free(host); return 1; no_match: if (!np[l]) @@ -486,10 +486,17 @@ no_match: np += l + 1; } } - mem_free(host); return 0; } +int is_noproxy_url(unsigned char *url) +{ + unsigned char *host = get_host_name(url); + int r = is_noproxy_host(host); + mem_free(host); + return r; +} + static void run_connection(struct connection *c) { struct h_conn *hc; @@ -522,17 +529,21 @@ static void run_connection(struct connection *c) del_connection(c); return; } - if (!(hc = is_host_on_list(c))) { - hc = mem_alloc(sizeof(struct h_conn)); - if (!(hc->host = get_host_name(c->url))) { - mem_free(hc); - goto s_bad_url; + if (c->doh && func != http_func && func != https_func && func != proxy_func) + goto s_bad_url; + if (!c->doh) { + if (!(hc = is_host_on_list(c))) { + hc = mem_alloc(sizeof(struct h_conn)); + if (!(hc->host = get_host_name(c->url))) { + mem_free(hc); + goto s_bad_url; + } + hc->conn = 0; + add_to_list(h_conns, hc); } - hc->conn = 0; - add_to_list(h_conns, hc); + hc->conn++; + active_connections++; } - hc->conn++; - active_connections++; c->keepalive = 0; c->running = 1; func(c); @@ -601,17 +612,19 @@ void abort_connection(struct connection *c) static int try_connection(struct connection *c) { - struct h_conn *hc = NULL; - if ((hc = is_host_on_list(c))) { - if (hc->conn >= max_connections_to_host) { - if (try_to_suspend_connection(c, hc->host)) return 0; + struct h_conn *hc; + if (!c->doh) { + if ((hc = is_host_on_list(c))) { + if (hc->conn >= max_connections_to_host) { + if (try_to_suspend_connection(c, hc->host)) return 0; + else return -1; + } + } + if (active_connections >= max_connections) { + if (try_to_suspend_connection(c, NULL)) return 0; else return -1; } } - if (active_connections >= max_connections) { - if (try_to_suspend_connection(c, NULL)) return 0; - else return -1; - } run_connection(c); return 1; } @@ -627,7 +640,7 @@ static void check_queue_bugs(void) cc = 0; foreach(struct connection, d, ld, queue) { int q = getpri(d); - cc += d->running; + cc += d->running && !d->doh; if (q < p) { if (!ps) { internal_error("queue is not sorted"); @@ -755,7 +768,7 @@ int disallow_url(unsigned char *url, int allow_flags) /* prev_url is a pointer to previous url or NULL */ /* prev_url will NOT be deallocated */ -void load_url(unsigned char *url, unsigned char *prev_url, struct status *stat, int pri, int no_cache, int no_compress, int allow_flags, off_t position) +void load_url(unsigned char *url, unsigned char *prev_url, struct status *stat, int pri, int no_cache, int no_compress, int doh, int allow_flags, off_t position) { struct cache_entry *e = NULL; struct connection *c; @@ -785,7 +798,7 @@ void load_url(unsigned char *url, unsigned char *prev_url, struct status *stat, } } #endif - if (is_url_blocked(url)) { + if (!doh && is_url_blocked(url)) { if (stat) { stat->state = S_BLOCKED_URL; if (stat->end) stat->end(stat, stat->data); @@ -841,6 +854,10 @@ void load_url(unsigned char *url, unsigned char *prev_url, struct status *stat, u = get_proxy(url); foreach(struct connection, c, lc, queue) if (!c->detached && !strcmp(cast_const_char c->url, cast_const_char u)) { if (c->from < position) continue; + if (c->doh != doh) { + must_detach = 1; + break; + } if (no_compress && !c->no_compress) { unsigned char *enc; if ((c->state >= S_WAIT && c->state < S_TRANS) || !c->cache) { @@ -910,6 +927,7 @@ void load_url(unsigned char *url, unsigned char *prev_url, struct status *stat, #else c->no_compress = 1; #endif + c->doh = doh; c->prg.timer = NULL; c->timer = NULL; if (position || must_detach) { diff --git a/session.c b/session.c index 2ba4539..889be26 100644 --- a/session.c +++ b/session.c @@ -827,7 +827,7 @@ static void download_data(struct status *stat, void *down_) if (!strcmp(cast_const_char down->url, cast_const_char prev_down_url) || down->redirect_cnt >= MAX_CACHED_REDIRECTS) cache = NC_RELOAD; allow_flags = get_allow_flags(prev_down_url); mem_free(prev_down_url); - load_url(down->url, NULL, &down->stat, PRI_DOWNLOAD, cache, 1, allow_flags, down->last_pos); + load_url(down->url, NULL, &down->stat, PRI_DOWNLOAD, cache, 1, 0, allow_flags, down->last_pos); return; } else { if (stat->state >= 0) change_connection(&down->stat, NULL, PRI_CANCEL); @@ -1178,7 +1178,7 @@ void start_download(struct session *ses, unsigned char *file, int mode) down->ses = ses; down->remotetime = 0; add_to_list(downloads, down); - load_url(url, NULL, &down->stat, PRI_DOWNLOAD, NC_CACHE, 1, ses->dn_allow_flags, down->last_pos); + load_url(url, NULL, &down->stat, PRI_DOWNLOAD, NC_CACHE, 1, 0, ses->dn_allow_flags, down->last_pos); display_download(ses->term, down, ses); } diff --git a/suffix.inc b/suffix.inc index c28aa17..8e4483c 100644 --- a/suffix.inc +++ b/suffix.inc @@ -9,6 +9,8 @@ static_const const_char_ptr domain_suffix[] = { "*.backyards.banzaicloud.io", "*.banzai.cloud", "*.bd", + "*.beget.app", + "*.build.run", "*.bzz.dapps.earth", "*.ck", "*.cloud.metacentrum.cz", @@ -22,6 +24,7 @@ static_const const_char_ptr domain_suffix[] = { "*.cryptonomic.net", "*.customer-oci.com", "*.dapps.earth", + "*.database.run", "*.dev.adobeaemcloud.com", "*.devcdnaccesso.com", "*.developer.app", @@ -52,6 +55,7 @@ static_const const_char_ptr domain_suffix[] = { "*.lclstage.dev", "*.linodeobjects.com", "*.magentosite.cloud", + "*.migration.run", "*.mm", "*.moonscale.io", "*.nagoya.jp", @@ -92,8 +96,10 @@ static_const const_char_ptr domain_suffix[] = { "*.triton.zone", "*.tst.site", "*.uberspace.de", + "*.user.localcert.dev", "*.usercontent.goog", "*.vps.myjino.ru", + "*.vultrobjects.com", "*.webhare.dev", "*.webpaas.ovh.net", "*.yokohama.jp", @@ -247,7 +253,6 @@ static_const const_char_ptr domain_suffix[] = { "aeroport.fr", "aetna", "af", - "afamilycompany", "affinitylottery.org.uk", "afjord.no", "afl", @@ -288,12 +293,16 @@ static_const const_char_ptr domain_suffix[] = { "aircraft.aero", "airforce", "airguard.museum", + "airkitapps-au.com", + "airkitapps.com", + "airkitapps.eu", "airline.aero", "airport.aero", "airtel", "airtraffic.aero", "aisai.aichi.jp", "aisho.shiga.jp", + "aivencloud.com", "aizubange.fukushima.jp", "aizumi.tokushima.jp", "aizumisato.fukushima.jp", @@ -377,7 +386,6 @@ static_const const_char_ptr domain_suffix[] = { "amscompute.com", "amsterdam", "amsterdam.museum", - "amsw.nl", "amusement.aero", "an.it", "analytics", @@ -397,6 +405,7 @@ static_const const_char_ptr domain_suffix[] = { "andriabarlettatrani.it", "andriatranibarletta.it", "android", + "angry.jp", "anjo.aichi.jp", "ann-arbor.mi.us", "annaka.gunma.jp", @@ -431,6 +440,7 @@ static_const const_char_ptr domain_suffix[] = { "ap.leg.br", "aparecida.br", "apartments", + "api.gov.uk", "api.stdlib.com", "apigee.io", "app", @@ -646,6 +656,9 @@ static_const const_char_ptr domain_suffix[] = { "ba.leg.br", "babia-gora.pl", "baby", + "babyblue.jp", + "babymilk.jp", + "backdrop.jp", "backplaneapp.io", "badaddja.no", "badajoz.museum", @@ -668,6 +681,7 @@ static_const const_char_ptr domain_suffix[] = { "balsan.it", "balsfjord.no", "baltimore.museum", + "bambina.jp", "bamble.no", "banamex", "bananarepublic", @@ -721,6 +735,8 @@ static_const const_char_ptr domain_suffix[] = { "barueri.br", "barum.no", "bas.it", + "base.ec", + "base.shop", "baseball", "baseball.museum", "basel.museum", @@ -783,6 +799,7 @@ static_const const_char_ptr domain_suffix[] = { "bet", "bet.ar", "beta.bounty-full.com", + "beta.tailscale.net", "betainabox.com", "better-than.tv", "bf", @@ -825,6 +842,7 @@ static_const const_char_ptr domain_suffix[] = { "birthplace.museum", "bitbridge.net", "bitbucket.io", + "bitter.jp", "biz", "biz.at", "biz.az", @@ -872,7 +890,6 @@ static_const const_char_ptr domain_suffix[] = { "blogdns.com", "blogdns.net", "blogdns.org", - "bloger.id", "blogsite.org", "blogsite.xyz", "blogspot.ae", @@ -954,6 +971,7 @@ static_const const_char_ptr domain_suffix[] = { "bloxcms.com", "blue", "bluebite.io", + "blush.jp", "bm", "bmd.br", "bmoattachments.org", @@ -985,6 +1003,7 @@ static_const const_char_ptr domain_suffix[] = { "bond", "bonn.museum", "boo", + "boo.jp", "book", "booking", "bookonline.app", @@ -1004,6 +1023,8 @@ static_const const_char_ptr domain_suffix[] = { "boutir.com", "box", "boxfuse.io", + "boy.jp", + "boyfriend.jp", "bozen-sudtirol.it", "bozen-suedtirol.it", "bozen.it", @@ -1049,7 +1070,6 @@ static_const const_char_ptr domain_suffix[] = { "bt", "bt.it", "bu.no", - "budapest", "budejju.no", "bugatti", "build", @@ -1068,7 +1088,9 @@ static_const const_char_ptr domain_suffix[] = { "busan.kr", "bushey.museum", "business", + "but.jp", "buy", + "buyshop.jp", "buyshouses.net", "buzen.fukuoka.jp", "buzz", @@ -1117,6 +1139,7 @@ static_const const_char_ptr domain_suffix[] = { "camdvr.org", "camera", "camp", + "campaign.gov.uk", "campania.it", "campidano-medio.it", "campidanomedio.it", @@ -1126,11 +1149,13 @@ static_const const_char_ptr domain_suffix[] = { "can.museum", "canada.museum", "cancerresearch", + "candypop.jp", "canon", "capebreton.museum", "capetown", "capital", "capitalone", + "capoo.jp", "car", "caracal.mythic-beasts.com", "caravan", @@ -1163,6 +1188,7 @@ static_const const_char_ptr domain_suffix[] = { "catanzaro.it", "catering", "catering.aero", + "catfood.jp", "catholic", "catholic.edu.au", "caxias.br", @@ -1271,6 +1297,7 @@ static_const const_char_ptr domain_suffix[] = { "chat", "chattanooga.museum", "cheap", + "cheap.jp", "cheltenham.museum", "cherkassy.ua", "cherkasy.ua", @@ -1281,6 +1308,7 @@ static_const const_char_ptr domain_suffix[] = { "chesapeakebay.museum", "chiba.jp", "chicago.museum", + "chicappa.jp", "chichibu.saitama.jp", "chieti.it", "chigasaki.kanagawa.jp", @@ -1297,10 +1325,12 @@ static_const const_char_ptr domain_suffix[] = { "children.museum", "childrens.museum", "childrensgarden.museum", + "chillout.jp", "chimkent.su", "chino.nagano.jp", "chintai", "chippubetsu.hokkaido.jp", + "chips.jp", "chiropractic.museum", "chirurgiens-dentistes-en-france.fr", "chirurgiens-dentistes.fr", @@ -1315,11 +1345,13 @@ static_const const_char_ptr domain_suffix[] = { "chonan.chiba.jp", "chosei.chiba.jp", "choshi.chiba.jp", + "chowder.jp", "choyo.kumamoto.jp", "christiansburg.museum", "christmas", "chrome", "chtr.k12.ma.us", + "chu.jp", "chungbuk.kr", "chungnam.kr", "chuo.chiba.jp", @@ -1330,6 +1362,7 @@ static_const const_char_ptr domain_suffix[] = { "church", "ci", "ci.it", + "ciao.jp", "ciencia.bo", "cieszyn.pl", "cim.br", @@ -1374,6 +1407,7 @@ static_const const_char_ptr domain_suffix[] = { "cloud.goog", "cloud.interhostsolutions.be", "cloud.jelastic.open.tim.it", + "cloud.nospamproxy.com", "cloud66.ws", "cloud66.zone", "cloudaccess.host", @@ -1494,6 +1528,8 @@ static_const const_char_ptr domain_suffix[] = { "coach", "coal.museum", "coastaldefence.museum", + "cocotte.jp", + "codeberg.page", "codes", "codespot.com", "cody.museum", @@ -1537,6 +1573,7 @@ static_const const_char_ptr domain_suffix[] = { "com.cn", "com.co", "com.cu", + "com.cv", "com.cw", "com.cy", "com.de", @@ -1685,6 +1722,7 @@ static_const const_char_ptr domain_suffix[] = { "cooking", "cookingchannel", "cool", + "coolblog.jp", "coop", "coop.ar", "coop.br", @@ -1704,7 +1742,6 @@ static_const const_char_ptr domain_suffix[] = { "cosenza.it", "costume.museum", "couchpotatofries.org", - "couk.me", "council.aero", "country", "countryestate.museum", @@ -1722,6 +1759,7 @@ static_const const_char_ptr domain_suffix[] = { "crafting.xyz", "crafts.museum", "cranbrook.museum", + "cranky.jp", "crd.co", "creation.museum", "credit", @@ -1740,7 +1778,6 @@ static_const const_char_ptr domain_suffix[] = { "cruises", "cs.it", "cs.keliweb.cloud", - "csc", "csx.cc", "ct.it", "ct.us", @@ -1762,6 +1799,7 @@ static_const const_char_ptr domain_suffix[] = { "custom.metacentrum.cz", "customer.mythic-beasts.com", "customer.speedpartner.de", + "cutegirl.jp", "cv", "cv.ua", "cw", @@ -1784,6 +1822,7 @@ static_const const_char_ptr domain_suffix[] = { "d.bg", "d.gv.vc", "d.se", + "daa.jp", "dabur", "dad", "daegu.kr", @@ -1843,7 +1882,10 @@ static_const const_char_ptr domain_suffix[] = { "deals", "deatnu.no", "debian.net", + "deca.jp", + "deci.jp", "decorativearts.museum", + "dedibox.fr", "dedyn.io", "def.br", "definima.io", @@ -1878,6 +1920,8 @@ static_const const_char_ptr domain_suffix[] = { "design.aero", "design.museum", "det.br", + "deta.app", + "deta.dev", "detroit.museum", "dev", "dev-myqnapcloud.com", @@ -1895,11 +1939,15 @@ static_const const_char_ptr domain_suffix[] = { "diamonds", "dielddanuorri.no", "diet", + "digick.jp", "digital", "dinosaur.museum", "direct", + "direct.quickconnect.cn", "direct.quickconnect.to", "directory", + "discordsays.com", + "discordsez.com", "discount", "discourse.group", "discourse.team", @@ -1982,7 +2030,6 @@ static_const const_char_ptr domain_suffix[] = { "dst.mi.us", "dtv", "dubai", - "duck", "duckdns.org", "dunlop", "dupont", @@ -2095,6 +2142,7 @@ static_const const_char_ptr domain_suffix[] = { "edu.cn", "edu.co", "edu.cu", + "edu.cv", "edu.cw", "edu.dm", "edu.do", @@ -2206,13 +2254,14 @@ static_const const_char_ptr domain_suffix[] = { "education.museum", "educational.museum", "educator.aero", - "edugit.org", + "edugit.io", "ee", "ee.eu.org", "eero-stage.online", "eero.online", "eg", "egersund.no", + "egoism.jp", "egyptian.museum", "ehime.jp", "eid.no", @@ -2230,9 +2279,6 @@ static_const const_char_ptr domain_suffix[] = { "elementor.cloud", "elementor.cool", "elk.pl", - "elluciancrmadvance.com", - "elluciancrmadvise.com", - "elluciancrmrecruit.com", "elvendrell.museum", "elverum.no", "email", @@ -2250,6 +2296,8 @@ static_const const_char_ptr domain_suffix[] = { "en-root.fr", "en.it", "ena.gifu.jp", + "encoreapi.com", + "encr.app", "encyclopedic.museum", "endofinternet.net", "endofinternet.org", @@ -2323,6 +2371,7 @@ static_const const_char_ptr domain_suffix[] = { "eu-west-3.elasticbeanstalk.com", "eu.ax", "eu.com", + "eu.encoway.cloud", "eu.int", "eu.meteorapp.com", "eu.org", @@ -2354,6 +2403,7 @@ static_const const_char_ptr domain_suffix[] = { "fail", "fairwinds", "faith", + "fakefur.jp", "fam.pk", "family", "family.museum", @@ -2372,8 +2422,8 @@ static_const const_char_ptr domain_suffix[] = { "farmstead.museum", "farsund.no", "fashion", + "fashionstore.jp", "fast", - "fastblog.net", "fastly-terrarium.com", "fastlylb.net", "faststacks.net", @@ -2393,6 +2443,7 @@ static_const const_char_ptr domain_suffix[] = { "fedorapeople.org", "feedback", "feira.br", + "fem.jp", "fentiger.mythic-beasts.com", "fermo.it", "ferrara.it", @@ -2471,13 +2522,16 @@ static_const const_char_ptr domain_suffix[] = { "flanders.museum", "flap.id", "flatanger.no", + "fldrv.com", "flekkefjord.no", "flesberg.no", "flickr", + "flier.jp", "flight.aero", "flights", "flir", "flog.br", + "floppy.jp", "flora.no", "florence.it", "florida.museum", @@ -2493,6 +2547,7 @@ static_const const_char_ptr domain_suffix[] = { "fm.br", "fm.it", "fm.no", + "fnc.fr-par.scw.cloud", "fnd.br", "fnwk.site", "fo", @@ -2503,6 +2558,7 @@ static_const const_char_ptr domain_suffix[] = { "foo", "food", "foodnetwork", + "fool.jp", "football", "for-better.biz", "for-more.biz", @@ -2539,6 +2595,8 @@ static_const const_char_ptr domain_suffix[] = { "foz.br", "fr", "fr-1.paas.massivegrid.net", + "fr-par-1.baremetal.scw.cloud", + "fr-par-2.baremetal.scw.cloud", "fr.eu.org", "fr.it", "fra1-de.cloudjiffy.net", @@ -2564,6 +2622,7 @@ static_const const_char_ptr domain_suffix[] = { "freetls.fastly.net", "frei.no", "freiburg.museum", + "frenchkiss.jp", "fresenius", "fribourg.museum", "friuli-v-giulia.it", @@ -2689,6 +2748,7 @@ static_const const_char_ptr domain_suffix[] = { "funabashi.chiba.jp", "funagata.yamagata.jp", "funahashi.toyama.jp", + "functions.fnc.fr-par.scw.cloud", "fund", "fundacio.museum", "fuoisku.no", @@ -2744,7 +2804,6 @@ static_const const_char_ptr domain_suffix[] = { "gausdal.no", "gay", "gb", - "gb.com", "gb.net", "gbiz", "gc.ca", @@ -2802,6 +2861,8 @@ static_const const_char_ptr domain_suffix[] = { "ginan.gifu.jp", "ginowan.okinawa.jp", "ginoza.okinawa.jp", + "girlfriend.jp", + "girly.jp", "giske.no", "git-pages.rit.edu", "git-repos.de", @@ -2819,7 +2880,6 @@ static_const const_char_ptr domain_suffix[] = { "gjesdal.no", "gjovik.no", "gl", - "glade", "glas.museum", "glass", "glass.museum", @@ -2833,6 +2893,7 @@ static_const const_char_ptr domain_suffix[] = { "global.ssl.fastly.net", "globo", "glogow.pl", + "gloomy.jp", "gloppen.no", "glug.org.uk", "gm", @@ -2887,6 +2948,7 @@ static_const const_char_ptr domain_suffix[] = { "golf", "golffan.us", "gon.pk", + "gonna.jp", "gonohe.aomori.jp", "goo", "goodyear", @@ -2978,7 +3040,6 @@ static_const const_char_ptr domain_suffix[] = { "gov.kn", "gov.kp", "gov.kw", - "gov.ky", "gov.kz", "gov.la", "gov.lb", @@ -3069,6 +3130,7 @@ static_const const_char_ptr domain_suffix[] = { "gratangen.no", "gratis", "graz.museum", + "greater.jp", "green", "greta.fr", "grimstad.no", @@ -3150,6 +3212,7 @@ static_const const_char_ptr domain_suffix[] = { "habikino.osaka.jp", "habmer.no", "haboro.hokkaido.jp", + "hacca.jp", "hachijo.tokyo.jp", "hachinohe.aomori.jp", "hachioji.tokyo.jp", @@ -3188,6 +3251,7 @@ static_const const_char_ptr domain_suffix[] = { "hanamigawa.chiba.jp", "hanawa.fukushima.jp", "handa.aichi.jp", + "handcrafted.jp", "handson.museum", "hanggliding.aero", "hangout", @@ -3234,6 +3298,7 @@ static_const const_char_ptr domain_suffix[] = { "health.nz", "health.vn", "healthcare", + "heavy.jp", "heguri.nara.jp", "heimatunduhren.museum", "hekinan.aichi.jp", @@ -3246,6 +3311,7 @@ static_const const_char_ptr domain_suffix[] = { "hemnes.no", "hemsedal.no", "hepforge.org", + "her.jp", "herad.no", "here", "here-for-more.info", @@ -3255,6 +3321,7 @@ static_const const_char_ptr domain_suffix[] = { "herokussl.com", "heroy.more-og-romsdal.no", "heroy.nordland.no", + "heteml.net", "hgtv", "hi.cn", "hi.us", @@ -3293,6 +3360,7 @@ static_const const_char_ptr domain_suffix[] = { "higashiyamato.tokyo.jp", "higashiyodogawa.osaka.jp", "higashiyoshino.nara.jp", + "hiho.jp", "hiji.oita.jp", "hikari.yamaguchi.jp", "hikawa.shimane.jp", @@ -3307,6 +3375,7 @@ static_const const_char_ptr domain_suffix[] = { "hinohara.tokyo.jp", "hioki.kagoshima.jp", "hiphop", + "hippy.jp", "hirado.nagasaki.jp", "hiraizumi.iwate.jp", "hirakata.osaka.jp", @@ -3374,6 +3443,7 @@ static_const const_char_ptr domain_suffix[] = { "holiday", "holmestrand.no", "holtalen.no", + "holy.jp", "home-webserver.de", "home.dyndns.org", "homebuilt.aero", @@ -3404,6 +3474,7 @@ static_const const_char_ptr domain_suffix[] = { "honjo.akita.jp", "honjo.saitama.jp", "honjyo.akita.jp", + "hoplix.shop", "hopto.me", "hopto.org", "hornindal.no", @@ -3448,6 +3519,7 @@ static_const const_char_ptr domain_suffix[] = { "hughes", "huissier-justice.fr", "humanities.museum", + "hungry.jp", "hurdal.no", "hurum.no", "hvaler.no", @@ -3485,6 +3557,7 @@ static_const const_char_ptr domain_suffix[] = { "ichinomiya.chiba.jp", "ichinoseki.iwate.jp", "icu", + "icurus.jp", "id", "id.au", "id.forgerock.io", @@ -3495,7 +3568,6 @@ static_const const_char_ptr domain_suffix[] = { "id.us", "ide.kyoto.jp", "idf.il", - "idnblogger.com", "idrett.no", "idv.hk", "idv.tw", @@ -3589,6 +3661,11 @@ static_const const_char_ptr domain_suffix[] = { "ind.in", "ind.kw", "ind.tn", + "independent-commission.uk", + "independent-inquest.uk", + "independent-inquiry.uk", + "independent-panel.uk", + "independent-review.uk", "inderoy.no", "indian.museum", "indiana.museum", @@ -3596,7 +3673,6 @@ static_const const_char_ptr domain_suffix[] = { "indianmarket.museum", "indie.porn", "indigena.bo", - "indowapblog.com", "industria.bo", "industries", "ine.kyoto.jp", @@ -3658,6 +3734,7 @@ static_const const_char_ptr domain_suffix[] = { "int.bo", "int.ci", "int.co", + "int.cv", "int.eu.org", "int.is", "int.la", @@ -3684,6 +3761,7 @@ static_const const_char_ptr domain_suffix[] = { "io.kg", "iobb.net", "iopsys.se", + "ip.linodeusercontent.com", "ip6.arpa", "ipifony.net", "ipiranga", @@ -3815,6 +3893,7 @@ static_const const_char_ptr domain_suffix[] = { "itau", "itayanagi.aomori.jp", "itcouldbewor.se", + "itigo.jp", "ito.shizuoka.jp", "itoigawa.niigata.jp", "itoman.okinawa.jp", @@ -3886,6 +3965,7 @@ static_const const_char_ptr domain_suffix[] = { "jele.io", "jele.site", "jelenia-gora.pl", + "jellybean.jp", "jeonbuk.kr", "jeonnam.kr", "jerusalem.museum", @@ -4006,6 +4086,10 @@ static_const const_char_ptr domain_suffix[] = { "k12.wa.us", "k12.wi.us", "k12.wy.us", + "k8s.fr-par.scw.cloud", + "k8s.nl-ams.scw.cloud", + "k8s.pl-waw.scw.cloud", + "k8s.scw.cloud", "kaas.gg", "kadena.okinawa.jp", "kadogawa.miyazaki.jp", @@ -4084,6 +4168,7 @@ static_const const_char_ptr domain_suffix[] = { "kanra.gunma.jp", "kanuma.tochigi.jp", "kanzaki.saga.jp", + "kapsi.fi", "karacol.su", "karaganda.su", "karasjohka.no", @@ -4141,6 +4226,7 @@ static_const const_char_ptr domain_suffix[] = { "kawahara.tottori.jp", "kawai.iwate.jp", "kawai.nara.jp", + "kawaiishop.jp", "kawajima.saitama.jp", "kawakami.nagano.jp", "kawakami.nara.jp", @@ -4196,10 +4282,13 @@ static_const const_char_ptr domain_suffix[] = { "kiho.mie.jp", "kihoku.ehime.jp", "kijo.miyazaki.jp", + "kikirara.jp", "kikonai.hokkaido.jp", "kikuchi.kumamoto.jp", "kikugawa.shizuoka.jp", "kilatiron.com", + "kill.jp", + "kilo.jp", "kim", "kimino.wakayama.jp", "kimitsu.chiba.jp", @@ -4297,6 +4386,7 @@ static_const const_char_ptr domain_suffix[] = { "konskowola.pl", "konsulat.gov.pl", "konyvelo.hu", + "koobin.events", "koori.fukushima.jp", "kopervik.no", "koriyama.fukushima.jp", @@ -4347,6 +4437,7 @@ static_const const_char_ptr domain_suffix[] = { "krym.ua", "ks.ua", "ks.us", + "ktistory.com", "kuchinotsu.nagasaki.jp", "kudamatsu.yamaguchi.jp", "kudoyama.wakayama.jp", @@ -4387,6 +4478,7 @@ static_const const_char_ptr domain_suffix[] = { "kuroishi.aomori.jp", "kuroiso.tochigi.jp", "kuromatsunai.hokkaido.jp", + "kuron.jp", "kurotaki.nara.jp", "kurume.fukuoka.jp", "kusatsu.gunma.jp", @@ -4603,12 +4695,12 @@ static_const const_char_ptr domain_suffix[] = { "linkyard.cloud", "linz.museum", "lipsy", + "littlestar.jp", "live", "living", "living.museum", "livinghistory.museum", "livorno.it", - "lixil", "lk", "lk3.ru", "llc", @@ -4639,10 +4731,12 @@ static_const const_char_ptr domain_suffix[] = { "lohmus.me", "lol", "lolipop.io", + "lolitapunk.jp", "lom.it", "lom.no", "lombardia.it", "lombardy.it", + "lomo.jp", "lomza.pl", "lon-1.paas.massivegrid.net", "lon-2.paas.massivegrid.net", @@ -4660,6 +4754,8 @@ static_const const_char_ptr domain_suffix[] = { "lotto", "louvre.museum", "love", + "lovepop.jp", + "lovesick.jp", "lowicz.pl", "loyalist.museum", "lpages.co", @@ -4733,6 +4829,7 @@ static_const const_char_ptr domain_suffix[] = { "maibara.shiga.jp", "maif", "mail.pl", + "main.jp", "maintenance.aero", "maison", "maizuru.kyoto.jp", @@ -4894,6 +4991,7 @@ static_const const_char_ptr domain_suffix[] = { "merseine.nu", "mesaverde.museum", "messina.it", + "messwithdns.com", "meteorapp.com", "mex.com", "mg", @@ -4944,6 +5042,7 @@ static_const const_char_ptr domain_suffix[] = { "mil.cl", "mil.cn", "mil.co", + "mil.cy", "mil.do", "mil.ec", "mil.eg", @@ -5126,6 +5225,7 @@ static_const const_char_ptr domain_suffix[] = { "modelling.aero", "modena.it", "modern.museum", + "mods.jp", "modum.no", "moe", "moi", @@ -5137,8 +5237,10 @@ static_const const_char_ptr domain_suffix[] = { "moma.museum", "mombetsu.hokkaido.jp", "monash", + "mond.jp", "money", "money.museum", + "mongolian.jp", "monmouth.museum", "monster", "monticello.museum", @@ -5149,6 +5251,7 @@ static_const const_char_ptr domain_suffix[] = { "monzabrianza.it", "monzaebrianza.it", "monzaedellabrianza.it", + "moo.jp", "moonscale.net", "mordovia.ru", "mordovia.su", @@ -5240,6 +5343,7 @@ static_const const_char_ptr domain_suffix[] = { "music.museum", "musica.ar", "musica.bo", + "musician.io", "mutsu.aomori.jp", "mutsuzawa.chiba.jp", "mutual", @@ -5378,10 +5482,10 @@ static_const const_char_ptr domain_suffix[] = { "naklo.pl", "nalchik.ru", "nalchik.su", + "namaste.jp", "namdalseid.no", "name", "name.az", - "name.cy", "name.eg", "name.et", "name.fj", @@ -5678,6 +5782,7 @@ static_const const_char_ptr domain_suffix[] = { "nikaho.akita.jp", "nike", "niki.hokkaido.jp", + "nikita.jp", "nikko.tochigi.jp", "nikolaev.ua", "nikon", @@ -5717,6 +5822,7 @@ static_const const_char_ptr domain_suffix[] = { "nj.us", "njs.jelastic.vps-host.net", "nl", + "nl-ams-1.baremetal.scw.cloud", "nl.ca", "nl.ci", "nl.eu.org", @@ -5735,10 +5841,12 @@ static_const const_char_ptr domain_suffix[] = { "no.it", "nobeoka.miyazaki.jp", "noboribetsu.hokkaido.jp", + "nobushi.jp", "noda.chiba.jp", "noda.iwate.jp", - "nodum.co", - "nodum.io", + "nodes.k8s.fr-par.scw.cloud", + "nodes.k8s.nl-ams.scw.cloud", + "nodes.k8s.pl-waw.scw.cloud", "nog.community", "nogata.fukuoka.jp", "nogi.tochigi.jp", @@ -5766,10 +5874,12 @@ static_const const_char_ptr domain_suffix[] = { "nom.ve", "nom.za", "nombre.bo", + "nome.cv", "nome.pt", "nomi.ishikawa.jp", "nonoichi.ishikawa.jp", "noop.app", + "noor.jp", "nord-aurdal.no", "nord-fron.no", "nord-odal.no", @@ -5880,11 +5990,11 @@ static_const const_char_ptr domain_suffix[] = { "of.je", "of.london", "of.no", - "off", "off.ai", "office", "office-on-the.net", "official.academy", + "official.ec", "ofunato.iwate.jp", "og.ao", "og.it", @@ -5983,6 +6093,7 @@ static_const const_char_ptr domain_suffix[] = { "ondigitalocean.app", "one", "onfabrica.com", + "onflashdrive.app", "ong", "ong.br", "onga.fukuoka.jp", @@ -5998,6 +6109,7 @@ static_const const_char_ptr domain_suffix[] = { "ono.hyogo.jp", "onojo.fukuoka.jp", "onomichi.hiroshima.jp", + "onporter.run", "onred.one", "onrender.com", "ontario.museum", @@ -6006,6 +6118,7 @@ static_const const_char_ptr domain_suffix[] = { "ooguy.com", "ookuwa.nagano.jp", "ooo", + "oops.jp", "ooshika.nagano.jp", "open", "openair.museum", @@ -6065,6 +6178,7 @@ static_const const_char_ptr domain_suffix[] = { "org.cn", "org.co", "org.cu", + "org.cv", "org.cw", "org.cy", "org.dm", @@ -6310,10 +6424,11 @@ static_const const_char_ptr domain_suffix[] = { "pantheonsite.io", "parachuting.aero", "paragliding.aero", + "parallel.jp", + "parasite.jp", "paris", "paris.eu.org", "paris.museum", - "parliament.cy", "parliament.nz", "parma.it", "paroch.k12.ma.us", @@ -6343,10 +6458,15 @@ static_const const_char_ptr domain_suffix[] = { "pe.it", "pe.kr", "pe.leg.br", + "pecori.jp", + "peewee.jp", + "penne.jp", "penza.su", + "pepper.jp", "per.la", "per.nf", "per.sg", + "perma.jp", "perso.ht", "perso.sn", "perso.tn", @@ -6389,6 +6509,7 @@ static_const const_char_ptr domain_suffix[] = { "pid", "piedmont.it", "piemonte.it", + "pigboat.jp", "pila.pl", "pilot.aero", "pilots.museum", @@ -6397,6 +6518,7 @@ static_const const_char_ptr domain_suffix[] = { "pinb.gov.pl", "ping", "pink", + "pinoko.jp", "pioneer", "pippu.hokkaido.jp", "pisa.it", @@ -6512,6 +6634,7 @@ static_const const_char_ptr domain_suffix[] = { "principe.st", "priv.at", "priv.hu", + "priv.instances.scw.cloud", "priv.me", "priv.no", "priv.pl", @@ -6528,6 +6651,7 @@ static_const const_char_ptr domain_suffix[] = { "pro.om", "pro.pr", "pro.tt", + "pro.typeform.com", "pro.vn", "prochowice.pl", "prod", @@ -6559,8 +6683,10 @@ static_const const_char_ptr domain_suffix[] = { "pt.it", "pu.it", "pub", + "pub.instances.scw.cloud", "pub.sa", "publ.pt", + "public-inquiry.uk", "public.museum", "publishproxy.com", "pubol.museum", @@ -6569,7 +6695,10 @@ static_const const_char_ptr domain_suffix[] = { "pug.it", "puglia.it", "pulawy.pl", + "punyu.jp", "pup.gov.pl", + "pupu.jp", + "pussycat.jp", "pv.it", "pvh.br", "pvt.ge", @@ -6577,6 +6706,7 @@ static_const const_char_ptr domain_suffix[] = { "pw", "pwc", "py", + "pya.jp", "pyatigorsk.ru", "pymnt.uk", "pythonanywhere.com", @@ -6601,7 +6731,6 @@ static_const const_char_ptr domain_suffix[] = { "quebec.museum", "quest", "quicksytes.com", - "qvc", "r.bg", "r.cdn77.net", "r.se", @@ -6622,9 +6751,9 @@ static_const const_char_ptr domain_suffix[] = { "ragusa.it", "rahkkeravju.no", "raholt.no", - "raid", "railroad.museum", "railway.museum", + "raindrop.jp", "raisa.no", "rakkestad.no", "ralingen.no", @@ -6635,6 +6764,7 @@ static_const const_char_ptr domain_suffix[] = { "rar.ve", "ras.ru", "rauma.no", + "ravendb.cloud", "ravendb.community", "ravendb.me", "ravendb.run", @@ -6650,6 +6780,7 @@ static_const const_char_ptr domain_suffix[] = { "read-books.org", "readmyblog.org", "readthedocs.io", + "readymade.jp", "realestate", "realestate.pl", "realm.cz", @@ -6767,6 +6898,7 @@ static_const const_char_ptr domain_suffix[] = { "rochester.museum", "rockart.museum", "rocks", + "rocky.page", "rodeo", "rodoy.no", "rogers", @@ -6784,6 +6916,7 @@ static_const const_char_ptr domain_suffix[] = { "router.management", "rovigo.it", "rovno.ua", + "royal-commission.uk", "royken.no", "royrvik.no", "rr.gov.br", @@ -6849,6 +6982,9 @@ static_const const_char_ptr domain_suffix[] = { "s3-website.eu-central-1.amazonaws.com", "s3-website.eu-west-2.amazonaws.com", "s3-website.eu-west-3.amazonaws.com", + "s3-website.fr-par.scw.cloud", + "s3-website.nl-ams.scw.cloud", + "s3-website.pl-waw.scw.cloud", "s3-website.us-east-2.amazonaws.com", "s3.amazonaws.com", "s3.ap-northeast-2.amazonaws.com", @@ -6871,6 +7007,10 @@ static_const const_char_ptr domain_suffix[] = { "s3.eu-central-1.amazonaws.com", "s3.eu-west-2.amazonaws.com", "s3.eu-west-3.amazonaws.com", + "s3.fr-par.scw.cloud", + "s3.nl-ams.scw.cloud", + "s3.pl-waw.scw.cloud", + "s3.teckids.org", "s3.us-east-2.amazonaws.com", "sa", "sa-east-1.elasticbeanstalk.com", @@ -6883,6 +7023,7 @@ static_const const_char_ptr domain_suffix[] = { "sa.it", "saarland", "sabae.fukui.jp", + "sadist.jp", "sado.niigata.jp", "safe", "safety", @@ -7010,6 +7151,7 @@ static_const const_char_ptr domain_suffix[] = { "sc.ug", "sc.us", "sca", + "scalebook.scw.cloud", "scb", "sch.ae", "sch.id", @@ -7035,6 +7177,7 @@ static_const const_char_ptr domain_suffix[] = { "school.na", "school.nz", "school.za", + "schoolbus.jp", "schools.nsw.edu.au", "schule", "schulserver.de", @@ -7052,7 +7195,6 @@ static_const const_char_ptr domain_suffix[] = { "sciences.museum", "sciencesnaturelles.museum", "scientist.aero", - "scjohnson", "scot", "scotland.museum", "scrapper-site.net", @@ -7074,6 +7216,7 @@ static_const const_char_ptr domain_suffix[] = { "sebastopol.ua", "sec.ps", "secaas.hk", + "secret.jp", "secure", "security", "securitytactics.com", @@ -7274,6 +7417,7 @@ static_const const_char_ptr domain_suffix[] = { "shoparena.pl", "shopitsite.com", "shopping", + "shopselect.net", "shopware.store", "shouji", "show", @@ -7294,6 +7438,7 @@ static_const const_char_ptr domain_suffix[] = { "siellak.no", "siena.it", "sigdal.no", + "siiites.com", "siljan.no", "silk", "silk.museum", @@ -7304,6 +7449,8 @@ static_const const_char_ptr domain_suffix[] = { "siracusa.it", "sirdal.no", "site", + "site.tb-hosting.com", + "site.transip.me", "siteleaf.net", "sites.static.land", "sj", @@ -7347,6 +7494,7 @@ static_const const_char_ptr domain_suffix[] = { "sm.ua", "small-web.org", "smart", + "smartlabeling.scw.cloud", "smile", "smola.no", "smushcdn.com", @@ -7447,6 +7595,7 @@ static_const const_char_ptr domain_suffix[] = { "ssl.origin.cdn77-secure.org", "st", "st.no", + "staba.jp", "stackhero-network.com", "stada", "stadt.museum", @@ -7505,6 +7654,7 @@ static_const const_char_ptr domain_suffix[] = { "strand.no", "stranda.no", "stream", + "stripper.jp", "stryn.no", "student.aero", "studio", @@ -7516,6 +7666,7 @@ static_const const_char_ptr domain_suffix[] = { "style", "su", "su.paba.se", + "sub.jp", "sucks", "sue.fukuoka.jp", "suedtirol.it", @@ -7537,9 +7688,11 @@ static_const const_char_ptr domain_suffix[] = { "sunagawa.hokkaido.jp", "sund.no", "sunndal.no", + "sunnyday.jp", "supabase.co", "supabase.in", "supabase.net", + "supersale.jp", "supplies", "supply", "support", @@ -7569,7 +7722,6 @@ static_const const_char_ptr domain_suffix[] = { "swidnica.pl", "swidnik.pl", "swiebodzin.pl", - "swiftcover", "swinoujscie.pl", "swiss", "sx", @@ -7718,6 +7870,7 @@ static_const const_char_ptr domain_suffix[] = { "tec.mi.us", "tec.ve", "tech", + "tech.orange", "technology", "technology.museum", "tecnologia.bo", @@ -7760,11 +7913,14 @@ static_const const_char_ptr domain_suffix[] = { "theater", "theater.museum", "theatre", + "theshop.jp", "theworkpc.com", + "thick.jp", "thingdustdata.com", "thruhere.net", "tiaa", "tickets", + "tickets.io", "tienda", "tiffany", "time.museum", @@ -7861,6 +8017,7 @@ static_const const_char_ptr domain_suffix[] = { "tonami.toyama.jp", "tondabayashi.osaka.jp", "tone.ibaraki.jp", + "tonkotsu.jp", "tono.iwate.jp", "tonosho.kagawa.jp", "tonsberg.no", @@ -7938,6 +8095,7 @@ static_const const_char_ptr domain_suffix[] = { "tranibarlettaandria.it", "tranoy.no", "translate.goog", + "translated.page", "transport.museum", "transporte.bo", "trapani.it", @@ -7996,6 +8154,7 @@ static_const const_char_ptr domain_suffix[] = { "trycloudflare.com", "trysil.no", "ts.it", + "ts.net", "tselinograd.su", "tsk.tr", "tsu.mie.jp", @@ -8064,6 +8223,7 @@ static_const const_char_ptr domain_suffix[] = { "tychy.pl", "tydal.no", "tynset.no", + "typedream.app", "tysfjord.no", "tysnes.no", "tysvar.no", @@ -8109,7 +8269,6 @@ static_const const_char_ptr domain_suffix[] = { "uk.primetel.cloud", "uk.reclaim.cloud", "uk0.bigv.io", - "ukco.me", "uki.kumamoto.jp", "ukiha.fukuoka.jp", "ullensaker.no", @@ -8124,6 +8283,7 @@ static_const const_char_ptr domain_suffix[] = { "umi.fukuoka.jp", "umig.gov.pl", "unazuki.toyama.jp", + "under.jp", "under.one", "undersea.museum", "uni5.net", @@ -8142,7 +8302,9 @@ static_const const_char_ptr domain_suffix[] = { "uonuma.niigata.jp", "uozu.toyama.jp", "upaas.kazteleport.kz", + "upli.io", "upow.gov.pl", + "upper.jp", "uppo.gov.pl", "ups", "urakawa.hokkaido.jp", @@ -8273,6 +8435,7 @@ static_const const_char_ptr domain_suffix[] = { "vega.no", "vegarshei.no", "vegas", + "velvet.jp", "ven.it", "veneto.it", "venezia.it", @@ -8288,7 +8451,9 @@ static_const const_char_ptr domain_suffix[] = { "verona.it", "verran.no", "versailles.museum", + "verse.jp", "versicherung", + "versus.jp", "vestby.no", "vestnes.no", "vestre-slidre.no", @@ -8334,12 +8499,12 @@ static_const const_char_ptr domain_suffix[] = { "virtual.museum", "virtualserver.io", "virtualuser.de", - "virtueeldomein.nl", "virtuel.museum", "visa", "vision", "viterbo.it", "viva", + "vivian.jp", "vivo", "vix.br", "vlaanderen", @@ -8420,10 +8585,9 @@ static_const const_char_ptr domain_suffix[] = { "watch-and-clock.museum", "watchandclock.museum", "watches", + "watson.jp", "waw.pl", "wazuka.kyoto.jp", - "wblog.id", - "wbq.me", "we.bs", "we.tc", "weather", @@ -8451,6 +8615,7 @@ static_const const_char_ptr domain_suffix[] = { "webhop.net", "webhop.org", "webhosting.be", + "weblike.jp", "webredirect.org", "website", "website.yandexcloud.net", @@ -8473,6 +8638,9 @@ static_const const_char_ptr domain_suffix[] = { "westus2.azurestaticapps.net", "wf", "whaling.museum", + "whitesnow.jp", + "whm.fr-par.scw.cloud", + "whm.nl-ams.scw.cloud", "whoswho", "wi.us", "wielun.pl", @@ -8568,7 +8736,6 @@ static_const const_char_ptr domain_suffix[] = { "xn--3ds443g", "xn--3e0b707e", "xn--3hcrj9c", - "xn--3oq18vl8pn36a", "xn--3pxu8k", "xn--41a.xn--p1acf", "xn--42c2d9a", @@ -9175,6 +9342,7 @@ static_const const_char_ptr domain_suffix[] = { "zj.cn", "zlg.br", "zm", + "zombie.jp", "zone", "zoological.museum", "zoology.museum", diff --git a/suffix/public_suffix_list.dat b/suffix/public_suffix_list.dat index 396771e..237e159 100644 --- a/suffix/public_suffix_list.dat +++ b/suffix/public_suffix_list.dat @@ -9,7 +9,7 @@ // ===BEGIN ICANN DOMAINS=== -// ac : https://en.wikipedia.org/wiki/.ac +// ac : http://nic.ac/rules.htm ac com.ac edu.ac @@ -22,8 +22,7 @@ org.ac ad nom.ad -// ae : https://en.wikipedia.org/wiki/.ae -// see also: "Domain Name Eligibility Policy" at http://www.aeda.ae/eng/aepolicy.php +// ae : https://tdra.gov.ae/en/aeda/ae-policies ae co.ae net.ae @@ -842,7 +841,13 @@ gov.cu inf.cu // cv : https://en.wikipedia.org/wiki/.cv +// cv : http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100); <- registration rules cv +com.cv +edu.cv +int.cv +nome.cv +org.cv // cw : http://www.una.cw/cw_registry/ // Confirmed by registry 2013-03-26 @@ -859,6 +864,7 @@ gov.cx // cy : http://www.nic.cy/ // Submitted by registry Panayiotou Fotia +// namespace policies URL https://www.nic.cy/portal//sites/default/files/symfonia_gia_eggrafi.pdf cy ac.cy biz.cy @@ -866,10 +872,9 @@ com.cy ekloges.cy gov.cy ltd.cy -name.cy +mil.cy net.cy org.cy -parliament.cy press.cy pro.cy tm.cy @@ -1179,6 +1184,7 @@ org.gu web.gu // gw : https://en.wikipedia.org/wiki/.gw +// gw : https://nic.gw/regras/ gw // gy : https://en.wikipedia.org/wiki/.gy @@ -1359,7 +1365,7 @@ info int eu.int -// io : http://www.nic.io/rules.html +// io : http://www.nic.io/rules.htm // list of other 2nd level tlds ? io com.io @@ -3758,11 +3764,10 @@ org.kw // ky : http://www.icta.ky/da_ky_reg_dom.php // Confirmed by registry 2008-06-17 ky -edu.ky -gov.ky com.ky -org.ky +edu.ky net.ky +org.ky // kz : https://en.wikipedia.org/wiki/.kz // see also: http://www.nic.kz/rules/index.jsp @@ -5853,7 +5858,7 @@ com.ps org.ps net.ps -// pt : http://online.dns.pt/dns/start_dns +// pt : https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/ pt net.pt gov.pt @@ -6030,7 +6035,7 @@ gov.sg edu.sg per.sg -// sh : http://www.nic.sh/registrar.html +// sh : http://nic.sh/rules.htm sh com.sh net.sh @@ -7125,7 +7130,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2021-10-01T15:13:10Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-03-27T15:13:38Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7190,9 +7195,6 @@ aeg // aetna : 2015-05-21 Aetna Life Insurance Company aetna -// afamilycompany : 2015-07-23 Johnson Shareholdings, Inc. -afamilycompany - // afl : 2014-10-02 Australian Football League afl @@ -7331,7 +7333,7 @@ audi // audible : 2015-06-25 Amazon Registry Services, Inc. audible -// audio : 2014-03-20 UNR Corp. +// audio : 2014-03-20 XYZ.COM LLC audio // auspost : 2015-08-13 Australian Postal Corporation @@ -7523,7 +7525,7 @@ bosch // bostik : 2015-05-28 Bostik SA bostik -// boston : 2015-12-10 Boston TLD Management, LLC +// boston : 2015-12-10 Registry Services, LLC boston // bot : 2014-12-18 Amazon Registry Services, Inc. @@ -7553,9 +7555,6 @@ brother // brussels : 2014-02-06 DNS.be vzw brussels -// budapest : 2013-11-21 Minds + Machines Group Limited -budapest - // bugatti : 2015-07-23 Bugatti International SA bugatti @@ -7592,7 +7591,7 @@ call // calvinklein : 2015-07-30 PVH gTLD Holdings LLC calvinklein -// cam : 2016-04-21 AC Webconnecting Holding B.V. +// cam : 2016-04-21 Cam Connecting SARL cam // camera : 2013-08-27 Binky Moon, LLC @@ -7640,7 +7639,7 @@ cars // casa : 2013-11-21 Registry Services, LLC casa -// case : 2015-09-03 CNH Industrial N.V. +// case : 2015-09-03 Helium TLDs Ltd case // cash : 2014-03-06 Binky Moon, LLC @@ -7703,7 +7702,7 @@ cheap // chintai : 2015-06-11 CHINTAI Corporation chintai -// christmas : 2013-11-21 UNR Corp. +// christmas : 2013-11-21 XYZ.COM LLC christmas // chrome : 2014-07-24 Charleston Road Registry Inc. @@ -7865,9 +7864,6 @@ cruise // cruises : 2013-12-05 Binky Moon, LLC cruises -// csc : 2014-09-25 Alliance-One Services, Inc. -csc - // cuisinella : 2014-04-03 SCHMIDT GROUPE S.A.S. cuisinella @@ -7955,7 +7951,7 @@ dhl // diamonds : 2013-09-22 Binky Moon, LLC diamonds -// diet : 2014-06-26 UNR Corp. +// diet : 2014-06-26 XYZ.COM LLC diet // digital : 2014-03-06 Binky Moon, LLC @@ -8009,9 +8005,6 @@ dtv // dubai : 2015-01-01 Dubai Smart Government Department dubai -// duck : 2015-07-23 Johnson Shareholdings, Inc. -duck - // dunlop : 2015-07-02 The Goodyear Tire & Rubber Company dunlop @@ -8204,7 +8197,7 @@ flir // florist : 2013-11-07 Binky Moon, LLC florist -// flowers : 2014-10-09 UNR Corp. +// flowers : 2014-10-09 XYZ.COM LLC flowers // fly : 2014-05-08 Charleston Road Registry Inc. @@ -8291,7 +8284,7 @@ gallo // gallup : 2015-02-19 Gallup, Inc. gallup -// game : 2015-05-28 UNR Corp. +// game : 2015-05-28 XYZ.COM LLC game // games : 2015-05-28 Dog Beach, LLC @@ -8339,9 +8332,6 @@ gives // giving : 2014-11-13 Giving Limited giving -// glade : 2015-07-23 Johnson Shareholdings, Inc. -glade - // glass : 2013-11-07 Binky Moon, LLC glass @@ -8429,7 +8419,7 @@ guge // guide : 2013-09-13 Binky Moon, LLC guide -// guitars : 2013-11-14 UNR Corp. +// guitars : 2013-11-14 XYZ.COM LLC guitars // guru : 2013-08-27 Binky Moon, LLC @@ -8477,7 +8467,7 @@ hermes // hgtv : 2015-07-02 Lifestyle Domain Holdings, Inc. hgtv -// hiphop : 2014-03-06 UNR Corp. +// hiphop : 2014-03-06 Dot Hip Hop, LLC hiphop // hisamitsu : 2015-07-16 Hisamitsu Pharmaceutical Co.,Inc. @@ -8525,7 +8515,7 @@ hospital // host : 2014-04-17 Radix FZC host -// hosting : 2014-05-29 UNR Corp. +// hosting : 2014-05-29 XYZ.COM LLC hosting // hot : 2015-08-27 Amazon Registry Services, Inc. @@ -8873,9 +8863,6 @@ live // living : 2015-07-30 Lifestyle Domain Holdings, Inc. living -// lixil : 2015-03-19 LIXIL Group Corporation -lixil - // llc : 2017-12-14 Afilias Limited llc @@ -8897,7 +8884,7 @@ locus // loft : 2015-07-30 Annco, Inc. loft -// lol : 2015-01-30 UNR Corp. +// lol : 2015-01-30 XYZ.COM LLC lol // london : 2013-11-14 Dot London Domains Limited @@ -9014,7 +9001,7 @@ menu // merckmsd : 2016-07-14 MSD Registry Holdings, Inc. merckmsd -// miami : 2013-12-19 Minds + Machines Group Limited +// miami : 2013-12-19 Registry Services, LLC miami // microsoft : 2014-12-18 Microsoft Corporation @@ -9053,7 +9040,7 @@ moe // moi : 2014-12-18 Amazon Registry Services, Inc. moi -// mom : 2015-04-16 UNR Corp. +// mom : 2015-04-16 XYZ.COM LLC mom // monash : 2013-09-30 Monash University @@ -9209,9 +9196,6 @@ obi // observer : 2015-04-30 Dog Beach, LLC observer -// off : 2015-07-23 Johnson Shareholdings, Inc. -off - // office : 2015-03-12 Microsoft Corporation office @@ -9335,7 +9319,7 @@ photos // physio : 2014-05-01 PhysBiz Pty Ltd physio -// pics : 2013-11-14 UNR Corp. +// pics : 2013-11-14 XYZ.COM LLC pics // pictet : 2014-06-26 Pictet Europe S.A. @@ -9449,18 +9433,12 @@ quebec // quest : 2015-03-26 XYZ.COM LLC quest -// qvc : 2015-07-30 QVC, Inc. -qvc - // racing : 2014-12-04 Premier Registry Limited racing // radio : 2016-07-21 European Broadcasting Union (EBU) radio -// raid : 2015-07-23 Johnson Shareholdings, Inc. -raid - // read : 2014-12-18 Amazon Registry Services, Inc. read @@ -9665,9 +9643,6 @@ schwarz // science : 2014-09-11 dot Science Limited science -// scjohnson : 2015-07-23 Johnson Shareholdings, Inc. -scjohnson - // scot : 2014-01-23 Dot Scot Registry Limited scot @@ -9896,9 +9871,6 @@ suzuki // swatch : 2015-01-08 The Swatch Group Ltd swatch -// swiftcover : 2015-07-23 Swiftcover Insurance Services Limited -swiftcover - // swiss : 2014-10-16 Swiss Confederation swiss @@ -10022,7 +9994,7 @@ toray // toshiba : 2014-04-10 TOSHIBA Corporation toshiba -// total : 2015-08-06 Total SA +// total : 2015-08-06 TOTAL SE total // tours : 2015-01-22 Binky Moon, LLC @@ -10316,9 +10288,6 @@ xin // xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY 在线 -// xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd. -大众汽车 - // xn--3pxu8k : 2015-01-15 VeriSign Sarl 点看 @@ -10328,7 +10297,7 @@ xin // xn--45q11c : 2013-11-21 Zodiac Gemini Ltd 八卦 -// xn--4gbrim : 2013-10-04 Fans TLD Limited +// xn--4gbrim : 2013-10-04 Helium TLDs Ltd موقع // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center @@ -10663,6 +10632,16 @@ hlx3.page // Submitted by Przemyslaw Plewa beep.pl +// Airkit : https://www.airkit.com/ +// Submitted by Grant Cooksey +airkitapps.com +airkitapps-au.com +airkitapps.eu + +// Aiven: https://aiven.io/ +// Submitted by Etienne Stalmans +aivencloud.com + // alboto.ca : http://alboto.ca // Submitted by Anton Avramov barsy.ca @@ -10784,10 +10763,6 @@ s3-website.eu-west-2.amazonaws.com s3-website.eu-west-3.amazonaws.com s3-website.us-east-2.amazonaws.com -// Amsterdam Wireless: https://www.amsterdamwireless.nl/ -// Submitted by Imre Jonk -amsw.nl - // Amune : https://amune.org/ // Submitted by Team Amune t3l3p0rt.net @@ -10797,6 +10772,10 @@ tele.amune.org // Submitted by Apigee Security Team apigee.io +// Apphud : https://apphud.com +// Submitted by Alexander Selivanov +siiites.com + // Appspace : https://www.appspace.com // Submitted by Appspace Security Team appspacehosted.com @@ -10835,6 +10814,10 @@ myasustor.com // Submitted by Sam Smyth cdn.prod.atlassian-dev.net +// Authentick UG (haftungsbeschränkt) : https://authentick.net +// Submitted by Lukas Reschke +translated.page + // AVM : https://avm.de // Submitted by Andreas Weise myfritz.net @@ -10849,7 +10832,7 @@ onavstack.net *.advisor.ws // AZ.pl sp. z.o.o: https://az.pl -// Submited by Krzysztof Wolski +// Submitted by Krzysztof Wolski ecommerce-shop.pl // b-data GmbH : https://www.b-data.io @@ -10875,6 +10858,22 @@ rs.ba app.banzaicloud.io *.backyards.banzaicloud.io +// BASE, Inc. : https://binc.jp +// Submitted by Yuya NAGASAWA +base.ec +official.ec +buyshop.jp +fashionstore.jp +handcrafted.jp +kawaiishop.jp +supersale.jp +theshop.jp +shopselect.net +base.shop + +// Beget Ltd +// Submitted by Lev Nekrasov +*.beget.app // BetaInABox // Submitted by Adrian @@ -10977,7 +10976,6 @@ za.com // No longer operated by CentralNic, these entries should be adopted and/or removed by current operators // Submitted by Gavin Brown ar.com -gb.com hu.com kr.com no.com @@ -11031,10 +11029,6 @@ cx.ua discourse.group discourse.team -// ClearVox : http://www.clearvox.nl/ -// Submitted by Leon Rowland -virtueeldomein.nl - // Clever Cloud : https://www.clever-cloud.com/ // Submitted by Quentin Adam cleverapps.io @@ -11122,6 +11116,10 @@ cloudns.us // Submitted by Angelo Gladding cnpy.gdn +// Codeberg e. V. : https://codeberg.org +// Submitted by Moritz Marquardt +codeberg.page + // CoDNS B.V. co.nl co.no @@ -11248,11 +11246,21 @@ deno-staging.dev // Submitted by Peter Thomassen dedyn.io +// Deta: https://www.deta.sh/ +// Submitted by Aavash Shrestha +deta.app +deta.dev + // Diher Solutions : https://diher.solutions // Submitted by Didi Hermawan *.rss.my.id *.diher.solutions +// Discord Inc : https://discord.com +// Submitted by Sahn Lam +discordsays.com +discordsez.com + // DNS Africa Ltd https://dns.business // Submitted by Calvin Browne jozi.biz @@ -11637,12 +11645,6 @@ blogsite.xyz // Submitted by Dominik Menke dynv6.net -// Ellucian : https://ellucian.com -// Submitted by Josue Colon -elluciancrmadvance.com -elluciancrmadvise.com -elluciancrmrecruit.com - // E4YOU spol. s.r.o. : https://e4you.cz/ // Submitted by Vladimir Dudr e4.cz @@ -11666,14 +11668,19 @@ en-root.fr mytuleap.com tuleap-partners.com +// Encoretivity AB: https://encore.dev +// Submitted by André Eriksson +encr.app +encoreapi.com + // ECG Robotics, Inc: https://ecgrobotics.org // Submitted by onred.one staging.onred.one -// One.com: https://www.one.com/ -// Submitted by Jacob Bunk Nielsen -service.one +// encoway GmbH : https://www.encoway.de +// Submitted by Marcel Daus +eu.encoway.cloud // EU.org https://eu.org/ // Submitted by Pierre Beyssac @@ -11878,8 +11885,6 @@ app.os.stg.fedoraproject.org // FearWorks Media Ltd. : https://fearworksmedia.co.uk // submitted by Keith Fairley -couk.me -ukco.me conn.uk copro.uk hosp.uk @@ -11914,6 +11919,11 @@ fireweb.app // Submitted by Louis Chemineau flap.id +// FlashDrive : https://flashdrive.io +// Submitted by Eric Chan +onflashdrive.app +fldrv.com + // fly.io: https://fly.io // Submitted by Kurt Mackey fly.dev @@ -11978,10 +11988,22 @@ futuremailing.at *.kunden.ortsinfo.at *.statics.cloud -// GDS : https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains -// Submitted by David Illsley +// GDS : https://www.gov.uk/service-manual/technology/managing-domain-names +// Submitted by Stephen Ford +independent-commission.uk +independent-inquest.uk +independent-inquiry.uk +independent-panel.uk +independent-review.uk +public-inquiry.uk +royal-commission.uk +campaign.gov.uk service.gov.uk +// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk +// Submitted by Jamie Tanna +api.gov.uk + // Gehirn Inc. : https://www.gehirn.co.jp/ // Submitted by Kohei YOSHIDA gehirn.ne.jp @@ -12031,8 +12053,113 @@ co.ro shop.ro // GMO Pepabo, Inc. : https://pepabo.com/ -// Submitted by dojineko +// Submitted by Hosting Div lolipop.io +angry.jp +babyblue.jp +babymilk.jp +backdrop.jp +bambina.jp +bitter.jp +blush.jp +boo.jp +boy.jp +boyfriend.jp +but.jp +candypop.jp +capoo.jp +catfood.jp +cheap.jp +chicappa.jp +chillout.jp +chips.jp +chowder.jp +chu.jp +ciao.jp +cocotte.jp +coolblog.jp +cranky.jp +cutegirl.jp +daa.jp +deca.jp +deci.jp +digick.jp +egoism.jp +fakefur.jp +fem.jp +flier.jp +floppy.jp +fool.jp +frenchkiss.jp +girlfriend.jp +girly.jp +gloomy.jp +gonna.jp +greater.jp +hacca.jp +heavy.jp +her.jp +hiho.jp +hippy.jp +holy.jp +hungry.jp +icurus.jp +itigo.jp +jellybean.jp +kikirara.jp +kill.jp +kilo.jp +kuron.jp +littlestar.jp +lolitapunk.jp +lomo.jp +lovepop.jp +lovesick.jp +main.jp +mods.jp +mond.jp +mongolian.jp +moo.jp +namaste.jp +nikita.jp +nobushi.jp +noor.jp +oops.jp +parallel.jp +parasite.jp +pecori.jp +peewee.jp +penne.jp +pepper.jp +perma.jp +pigboat.jp +pinoko.jp +punyu.jp +pupu.jp +pussycat.jp +pya.jp +raindrop.jp +readymade.jp +sadist.jp +schoolbus.jp +secret.jp +staba.jp +stripper.jp +sub.jp +sunnyday.jp +thick.jp +tonkotsu.jp +under.jp +upper.jp +velvet.jp +verse.jp +versus.jp +vivian.jp +watson.jp +weblike.jp +whitesnow.jp +zombie.jp +heteml.net // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/ // Submitted by Tom Whitwell @@ -12164,7 +12291,7 @@ günstigbestellen.de günstigliefern.de // Hakaran group: http://hakaran.cz -// Submited by Arseniy Sokolov +// Submitted by Arseniy Sokolov fin.ci free.hr caa.li @@ -12199,6 +12326,7 @@ herokussl.com // Hibernating Rhinos // Submitted by Oren Eini +ravendb.cloud myravendb.com ravendb.community ravendb.me @@ -12206,13 +12334,18 @@ development.run ravendb.run // home.pl S.A.: https://home.pl -// Submited by Krzysztof Wolski +// Submitted by Krzysztof Wolski homesklep.pl // Hong Kong Productivity Council: https://www.hkpc.org/ // Submitted by SECaaS Team secaas.hk +// Hoplix : https://www.hoplix.com +// Submitted by Danilo De Franco +hoplix.shop + + // HOSTBIP REGISTRY : https://www.hostbip.com/ // Submitted by Atanunu Igbunuroghene orx.biz @@ -12311,7 +12444,7 @@ to.leg.br pixolino.com // Internet-Pro, LLP: https://netangels.ru/ -// Submited by Vasiliy Sheredeko +// Submitted by Vasiliy Sheredeko na4u.ru // iopsys software solutions AB : https://iopsys.eu/ @@ -12334,7 +12467,7 @@ iserv.dev iobb.net // Jelastic, Inc. : https://jelastic.com/ -// Submited by Ihor Kolodyuk +// Submitted by Ihor Kolodyuk mel.cloudlets.com.au cloud.interhostsolutions.be users.scale.virtualcloud.com.br @@ -12445,6 +12578,14 @@ js.org kaas.gg khplay.nl +// Kakao : https://www.kakaocorp.com/ +// Submitted by JaeYoong Lee +ktistory.com + +// Kapsi : https://kapsi.fi +// Submitted by Tomi Juntunen +kapsi.fi + // Keyweb AG : https://www.keyweb.de // Submitted by Martin Dannehl keymachine.de @@ -12458,6 +12599,10 @@ uni5.net // Submitted by Roy Keene knightpoint.systems +// KoobinEvent, SL: https://www.koobin.com +// Submitted by Iván Oliva +koobin.events + // KUROKU LTD : https://kuroku.ltd/ // Submitted by DisposaBoy oya.to @@ -12516,11 +12661,16 @@ linkyard-cloud.ch members.linode.com *.nodebalancer.linode.com *.linodeobjects.com +ip.linodeusercontent.com // LiquidNet Ltd : http://www.liquidnetlimited.com/ // Submitted by Victor Velchev we.bs +// Localcert : https://localcert.dev +// Submitted by Lann Martin +*.user.localcert.dev + // localzone.xyz // Submitted by Kenny Niehage localzone.xyz @@ -12725,6 +12875,10 @@ that.win from.work to.work +// Net at Work Gmbh : https://www.netatwork.de +// Submitted by Jan Jaeschke +cloud.nospamproxy.com + // Netlify : https://www.netlify.com // Submitted by Jessica Parsons netlify.app @@ -12753,7 +12907,10 @@ noop.app // Northflank Ltd. : https://northflank.com/ // Submitted by Marco Suter *.northflank.app +*.build.run *.code.run +*.database.run +*.migration.run // Noticeable : https://noticeable.io // Submitted by Laurent Pellegrino @@ -12884,11 +13041,6 @@ zapto.org // Submitted by Konstantin Nosov stage.nodeart.io -// Nodum B.V. : https://nodum.io/ -// Submitted by Wietse Wind -nodum.co -nodum.io - // Nucleos Inc. : https://nucleos.com // Submitted by Piotr Zduniak pcloud.host @@ -12917,6 +13069,10 @@ cloudycluster.net // Submitted by Vicary Archangel omniwe.site +// One.com: https://www.one.com/ +// Submitted by Jacob Bunk Nielsen +service.one + // One Fold Media : http://www.onefoldmedia.com/ // Submitted by Eddie Jones nid.io @@ -12937,8 +13093,12 @@ orsites.com // Submitted by Yngve Pettersen operaunite.com +// Orange : https://www.orange.com +// Submitted by Alexandre Linte +tech.orange + // Oursky Limited : https://authgear.com/, https://skygear.io/ -// Submited by Authgear Team , Skygear Developer +// Submitted by Authgear Team , Skygear Developer authgear-staging.com authgearapps.com skygearapp.com @@ -13046,6 +13206,10 @@ pleskns.com // Submitted by Maximilian Schieder dyn53.io +// Porter : https://porter.run/ +// Submitted by Rudraksh MK +onporter.run + // Positive Codes Technology Company : http://co.bn/faq.html // Submitted by Zulfais co.bn @@ -13207,6 +13371,10 @@ itcouldbewor.se // Submitted by Jennifer Herting git-pages.rit.edu +// Rocky Enterprise Software Foundation : https://resf.org +// Submitted by Neil Hanlon +rocky.page + // Rusnames Limited: http://rusnames.ru/ // Submitted by Sergey Zotov биз.рус @@ -13229,6 +13397,34 @@ sandcats.io logoip.de logoip.com +// Scaleway : https://www.scaleway.com/ +// Submitted by Rémy Léone +fr-par-1.baremetal.scw.cloud +fr-par-2.baremetal.scw.cloud +nl-ams-1.baremetal.scw.cloud +fnc.fr-par.scw.cloud +functions.fnc.fr-par.scw.cloud +k8s.fr-par.scw.cloud +nodes.k8s.fr-par.scw.cloud +s3.fr-par.scw.cloud +s3-website.fr-par.scw.cloud +whm.fr-par.scw.cloud +priv.instances.scw.cloud +pub.instances.scw.cloud +k8s.scw.cloud +k8s.nl-ams.scw.cloud +nodes.k8s.nl-ams.scw.cloud +s3.nl-ams.scw.cloud +s3-website.nl-ams.scw.cloud +whm.nl-ams.scw.cloud +k8s.pl-waw.scw.cloud +nodes.k8s.pl-waw.scw.cloud +s3.pl-waw.scw.cloud +s3-website.pl-waw.scw.cloud +scalebook.scw.cloud +smartlabeling.scw.cloud +dedibox.fr + // schokokeks.org GbR : https://schokokeks.org/ // Submitted by Hanno Böck schokokeks.net @@ -13349,6 +13545,8 @@ srht.site stackhero-network.com // Staclar : https://staclar.com +// Submitted by Q Misell +musician.io // Submitted by Matthias Merkel novecore.site @@ -13447,19 +13645,20 @@ syncloud.it // Synology, Inc. : https://www.synology.com/ // Submitted by Rony Weng -diskstation.me dscloud.biz -dscloud.me -dscloud.mobi +direct.quickconnect.cn dsmynas.com -dsmynas.net -dsmynas.org familyds.com -familyds.net -familyds.org +diskstation.me +dscloud.me i234.me myds.me synology.me +dscloud.mobi +dsmynas.net +familyds.net +dsmynas.org +familyds.org vpnplus.to direct.quickconnect.to @@ -13471,6 +13670,11 @@ tabitorder.co.il // Submitted by Bjoern Henke taifun-dns.de +// Tailscale Inc. : https://www.tailscale.com +// Submitted by David Anderson +beta.tailscale.net +ts.net + // TASK geographical domains (www.task.gda.pl/uslugi/dns) gda.pl gdansk.pl @@ -13478,9 +13682,14 @@ gdynia.pl med.pl sopot.pl +// team.blue https://team.blue +// Submitted by Cedric Dubois +site.tb-hosting.com + // Teckids e.V. : https://www.teckids.org // Submitted by Dominik George -edugit.org +edugit.io +s3.teckids.org // Telebit : https://telebit.cloud // Submitted by AJ ONeal @@ -13506,6 +13715,10 @@ reservd.dev.thingdust.io reservd.disrec.thingdust.io reservd.testing.thingdust.io +// ticket i/O GmbH : https://ticket.io +// Submitted by Christian Franke +tickets.io + // Tlon.io : https://tlon.io // Submitted by Mark Staarink arvo.network @@ -13554,6 +13767,10 @@ lima.zone *.transurl.eu *.transurl.nl +// TransIP: https://www.transip.nl +// Submitted by Cedric Dubois +site.transip.me + // TuxFamily : http://tuxfamily.org // Submitted by TuxFamily administrators tuxfamily.org @@ -13574,6 +13791,14 @@ syno-ds.de synology-diskstation.de synology-ds.de +// Typedream : https://typedream.com +// Submitted by Putri Karunia +typedream.app + +// Typeform : https://www.typeform.com +// Submitted by Sergi Ferriz +pro.typeform.com + // Uberspace : https://uberspace.de // Submitted by Moritz Werner uber.space @@ -13591,6 +13816,10 @@ inc.hk virtualuser.de virtual-user.de +// Upli : https://upli.io +// Submitted by Lenny Bakkalian +upli.io + // urown.net : https://urown.net // Submitted by Hostmaster urown.cloud @@ -13668,19 +13897,14 @@ me.vu // Submitted by Serhii Rostilo v.ua +// Vultr Objects : https://www.vultr.com/products/object-storage/ +// Submitted by Niels Maumenee +*.vultrobjects.com + // Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com // Submitted by Masayuki Note wafflecell.com -// WapBlog.ID : https://www.wapblog.id -// Submitted by Fajar Sodik -idnblogger.com -indowapblog.com -bloger.id -wblog.id -wbq.me -fastblog.net - // WebHare bv: https://www.webhare.com/ // Submitted by Arnold Hendriks *.webhare.dev @@ -13717,6 +13941,10 @@ wmcloud.org panel.gg daemon.panel.gg +// Wizard Zines : https://wizardzines.com +// Submitted by Julia Evans +messwithdns.com + // WoltLab GmbH : https://www.woltlab.com // Submitted by Tim Düsterhus woltlab-demo.com @@ -13739,7 +13967,7 @@ wpenginepowered.com js.wpenginepowered.com // Wix.com, Inc. : https://www.wix.com -// Submitted by Shahar Talmi +// Submitted by Shahar Talmi wixsite.com editorx.io diff --git a/types.c b/types.c index 4a1bb16..a663d17 100644 --- a/types.c +++ b/types.c @@ -750,6 +750,7 @@ void create_initial_extensions(void) ext.ext = cast_uchar "xpm", ext.ct=cast_uchar "image/x-xpixmap", update_ext(&ext); ext.ext = cast_uchar "xls", ext.ct=cast_uchar "application/excel", update_ext(&ext); ext.ext = cast_uchar "xbm", ext.ct=cast_uchar "image/x-xbitmap", update_ext(&ext); + ext.ext = cast_uchar "webp", ext.ct=cast_uchar "image/webp", update_ext(&ext); ext.ext = cast_uchar "wav", ext.ct=cast_uchar "audio/x-wav", update_ext(&ext); ext.ext = cast_uchar "tiff,tif", ext.ct=cast_uchar "image/tiff", update_ext(&ext); ext.ext = cast_uchar "tga", ext.ct=cast_uchar "image/targa", update_ext(&ext); @@ -797,6 +798,7 @@ struct list_head telnet_prog = { &telnet_prog, &telnet_prog }; struct list_head tn3270_prog = { &tn3270_prog, &tn3270_prog }; struct list_head mms_prog = { &mms_prog, &mms_prog }; struct list_head magnet_prog = { &magnet_prog, &magnet_prog }; +struct list_head gopher_prog = { &gopher_prog, &gopher_prog }; static int is_in_list(unsigned char *list, unsigned char *str, int l) @@ -900,6 +902,8 @@ unsigned char *get_content_type_by_extension(unsigned char *url) if ((extl == 3 && !casecmp(ext, cast_uchar "xbm", 3))) return stracpy(cast_uchar "image/x-xbitmap"); if ((extl == 3 && !casecmp(ext, cast_uchar "tif", 3)) || (extl == 4 && !casecmp(ext, cast_uchar "tiff", 4))) return stracpy(cast_uchar "image/tiff"); + if ((extl == 3 && !casecmp(ext, cast_uchar "svg", 3))) return stracpy(cast_uchar "image/svg+xml"); + if ((extl == 3 && !casecmp(ext, cast_uchar "webp", 3))) return stracpy(cast_uchar "image/webp"); exxt = init_str(); el = 0; add_to_str(&exxt, &el, cast_uchar "application/x-"); add_bytes_to_str(&exxt, &el, ext, extl); @@ -960,6 +964,8 @@ static unsigned char *get_extension_by_content_type(unsigned char *ct) if (!casestrcmp(ct, cast_uchar "image/svg") || !casestrcmp(ct, cast_uchar "image/svg+xml")) return stracpy(cast_uchar "svg"); + if (!casestrcmp(ct, cast_uchar "image/webp")) + return stracpy(cast_uchar "webp"); if (!cmpbeg(ct, cast_uchar "application/x-")) { x = ct + strlen("application/x-"); if (casestrcmp(x, cast_uchar "z") && @@ -1317,6 +1323,7 @@ void free_types(void) free_prog_list(&tn3270_prog); free_prog_list(&mms_prog); free_prog_list(&magnet_prog); + free_prog_list(&gopher_prog); free_history(ext_search_history); free_history(assoc_search_history); diff --git a/url.c b/url.c index 39a3899..e2b77c6 100644 --- a/url.c +++ b/url.c @@ -31,6 +31,7 @@ static_const struct { {"tn3270", 0, NULL, tn3270_func, 0, 0, 0, 0, 1}, {"mms", 0, NULL, mms_func, 1, 0, 1, 0, 1}, {"magnet", 0, NULL, magnet_func, 1, 0, 0, 0, 1}, + {"gopher", 0, NULL, gopher_func, 1, 0, 0, 0, 1}, #ifdef JS {"javascript", 0, NULL, javascript_func,1, 0, 0, 0, 0}, #endif @@ -266,6 +267,7 @@ static void translate_directories(unsigned char *url) int lo = !casecmp(url, cast_uchar "file://", 7); if (!casecmp(url, cast_uchar "javascript:", 11)) return; if (!casecmp(url, cast_uchar "magnet:", 7)) return; + if (!casecmp(url, cast_uchar "gopher:", 7)) return; if (!dd || dd == url /*|| *--dd != '/'*/) return; if (!dsep(*dd)) { dd--; diff --git a/view.c b/view.c index 2dfa3f8..1401805 100644 --- a/view.c +++ b/view.c @@ -2253,6 +2253,7 @@ unsigned char *get_form_url(struct session *ses, struct f_data_c *f, struct form else add_to_strn(&go, cast_uchar "?"); add_to_strn(&go, data); if (pos) { + add_to_strn(&go, cast_uchar "#"); add_to_strn(&go, pos); mem_free(pos); } @@ -2271,7 +2272,7 @@ unsigned char *get_form_url(struct session *ses, struct f_data_c *f, struct form for (i = 0; i < len; i++) { unsigned char p[3]; sprintf(cast_char p, "%02x", (int)data[i]); - add_to_str(&go, &l, p); + add_bytes_to_str(&go, &l, p, 2); } } x: diff --git a/webp.c b/webp.c new file mode 100644 index 0000000..2efbb81 --- /dev/null +++ b/webp.c @@ -0,0 +1,83 @@ +#include "cfg.h" + +#ifdef G +#include "links.h" + +#ifdef HAVE_WEBP + +#include + +struct webp_decoder { + unsigned char *buffer; + int len; +}; + +static void webp_free(unsigned char *ptr) +{ +#ifdef HAVE_WEBPFREE + WebPFree(ptr); +#else + free(ptr); +#endif +} + +void webp_start(struct cached_image *cimg) +{ + struct webp_decoder *deco; + deco = mem_alloc(sizeof(struct webp_decoder)); + deco->buffer = init_str(); + deco->len = 0; + cimg->decoder = deco; +} + +void webp_restart(struct cached_image *cimg, unsigned char *data, int length) +{ + struct webp_decoder *deco = (struct webp_decoder *)cimg->decoder; + add_bytes_to_str(&deco->buffer, &deco->len, data, length); +} + +void webp_finish(struct cached_image *cimg) +{ + int w, h; + struct webp_decoder *deco = (struct webp_decoder *)cimg->decoder; + unsigned char *pixels; + pixels = WebPDecodeRGBA(deco->buffer, deco->len, &w, &h); + if (!pixels) + goto end; + + cimg->width = w; + cimg->height = h; + cimg->buffer_bytes_per_pixel = 4; + cimg->red_gamma = cimg->green_gamma = cimg->blue_gamma = (float)sRGB_gamma; + cimg->strip_optimized = 0; + if (header_dimensions_known(cimg)) + goto end_free_pixels; + + memcpy(cimg->buffer, pixels, w * h * 4); +end_free_pixels: + webp_free(pixels); +end: + img_end(cimg); +} + +void webp_destroy_decoder(struct cached_image *cimg) +{ + struct webp_decoder *deco = (struct webp_decoder *)cimg->decoder; + mem_free(deco->buffer); +} + +void add_webp_version(unsigned char **s, int *l) +{ + int v = WebPGetDecoderVersion(); + add_to_str(s, l, cast_uchar "WEBP ("); + add_num_to_str(s, l, (v >> 16)); + add_chr_to_str(s, l, '.'); + add_num_to_str(s, l, (v >> 8) & 0xff); + add_chr_to_str(s, l, '.'); + add_num_to_str(s, l, v & 0xff); + add_chr_to_str(s, l, ')'); +} + +#endif + +#endif diff --git a/x.c b/x.c index 760df68..1bcebc5 100644 --- a/x.c +++ b/x.c @@ -2910,7 +2910,7 @@ static unsigned char *x_get_clipboard_text(void) if (tt > SELECTION_NOTIFY_TIMEOUT) w = 0; else - w = (SELECTION_NOTIFY_TIMEOUT - tt + 999) / 1000; + w = (SELECTION_NOTIFY_TIMEOUT - (unsigned)tt + 999) / 1000; if (!x_wait_for_event(w)) goto no_new_sel; }