Description: Git master branch of Debian's w3m Origin: https://salsa.debian.org/debian/w3m/commits/master diff --git a/Bonus/goodict.cgi b/Bonus/goodict.cgi index 8f443c1..5fb6581 100755 --- a/Bonus/goodict.cgi +++ b/Bonus/goodict.cgi @@ -1,14 +1,20 @@ #!/usr/bin/perl # ~/.w3m/urimethodmap -# e: file:/cgi-bin/goodict.cgi?%s -# w: file:/cgi-bin/goodict.cgi?%s -# j: file:/cgi-bin/goodict.cgi?%s +# e: file:/cgi-bin/goodict.cgi?%s Englich-Japanese +# w: file:/cgi-bin/goodict.cgi?%s Japanese-English +# j: file:/cgi-bin/goodict.cgi?%s Japanese +# a: file:/cgi-bin/goodict.cgi?%s All +# +# e:0:word start with word +# e:1:word perfect match +# e:2:word end with word +# e:3:word search body text +# e:6:word search title +# e:word perfect match -use NKF; -#$mode = 0; # substring -$mode = 1; # perfect match -#$mode = 3; # search body text +use Encode; +use Encode::Guess qw/euc-jp utf8/; $url = "http://dictionary.goo.ne.jp"; $_ = $ENV{"QUERY_STRING"}; if (/^e:/) { @@ -17,14 +23,22 @@ if (/^e:/) { $kind = 'je'; } elsif (/^j:/) { $kind = 'jn'; +} elsif (/^a:/) { + $kind = 'all' +} +s@^[ewja]:@@ && s@^//@@ && s@/$@@; +if (/^([01236]):/) { + $mode=$1; + s/^[01236]://; +}else{ + $mode="1"; } -s@^[ewjs]:@@ && s@^//@@ && s@/$@@; if ($_) { s/\+/ /g; s/%([\da-f][\da-f])/pack('C', hex($1))/egi; - $_ = nkf("-e", $_); + $_ = encode("utf8", decode("Guess", $_)); s/[\000-\040\+:#?&%<>"\177-\377]/sprintf('%%%02X', unpack('C', $&))/eg; - $url .= "/search.php?MT=$_&kind=$kind&mode=$mode"; + $url .= "/srch/$kind/$_/m$mode"."u/"; } else { $input = "w3m-control: GOTO_LINK"; } diff --git a/ChangeLog b/ChangeLog index 88358ef..2ea89c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1743 @@ +2020-05-02 Tatsuya Kinoshita + + * NEWS: Update NEWS for 0.5.3+git20200502. + +2020-03-27 Roland Illig + + * main.c: Fix -Wchar-subscripts. + Origin: http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/pkgsrc/www/w3m/patches/patch-main.c?rev=1.1&content-type=text/plain + Bug: https://sourceforge.net/p/w3m/patches/76/ + +2020-03-16 Tatsuya Kinoshita + + * doc-de/MANUAL.html, doc/MANUAL.html: Update documents for GOTO_HOME. + + * doc-de/README.func, doc-jp/README.func, doc-jp/keymap.default: + * doc/README.func, doc/keymap.default, scripts/w3mhelp.cgi.in: + Add GOTO_HOME to the help page. + +2020-03-11 Tatsuya Kinoshita + + * doc-jp/README.SSL, po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po: + * po/zh_TW.po, rc.c: Update documents for ssl_forbid_method. + + * url.c: Extend ssl_forbid_method for TLSv1.2 and TLSv1.3. + +2020-01-13 We're Yet <58348703+butwerenotthereyet@users.noreply.github.com> + + * keybind.c, main.c, proto.h: Add command to go home. + Origin: https://github.com/tats/w3m/pull/124 + +2019-11-10 Kyle J. McKay + + * entity.tab, indep.c, indep.h: Support ' entity. + Origin: https://github.com/tats/w3m/pull/122 + +2019-07-02 Tatsuya Kinoshita + + * doc-jp/README.siteconf: Update doc-jp for user_agent in siteconf. + +2019-07-01 Azure + + * doc/README.siteconf, fm.h, rc.c, url.c: + Allow setting User Agent in Siteconf. + Origin: https://github.com/tats/w3m/pull/119 + +2019-04-21 Laurent Arnoud + + * fm.h, main.c, url.c: Allow to override User-Agent with -header. + Origin: https://github.com/tats/w3m/pull/113 + +2019-01-05 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * config.guess, config.sub: + Update config.* with autotools-dev 20180224.1. + +2019-01-05 Akinori Hattori + + * w3mimg/fb/fb_imlib2.c: Fix dependency for Imlib2. + Bug-Gentoo: https://bugs.gentoo.org/605930 + Origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d6e3e6839898829e8cce211b97a7fa77f5d06e + +2018-12-22 Tatsuya Kinoshita + + * scripts/w3mman/w3mman.1.in, scripts/w3mman/w3mman.in: + Fix square brackets. + +2018-12-21 Nemo Inis + + * scripts/w3mman/w3mman.1.in, scripts/w3mman/w3mman.in: + * scripts/w3mman/w3mman2html.cgi.in: + w3mman support for section number during keyword search. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916968#5 + +2018-10-26 Ben Wong + + * buffer.c, display.c: + Fix that the MarkAllPages option works as originally intended. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911929 + +2018-10-26 Tatsuya Kinoshita + + * istream.c, url.c: Indentation fix. + +2018-10-24 Mark Wright + + * istream.c, url.c: Do not use deprecated features with openssl-1.1. + Bug-Gentoo: https://bugs.gentoo.org/592510 + Bug-Debian: https://github.com/tats/w3m/pull/103 + +2018-05-20 Andrew Santosa + + * po/Makefile.in.in: Added check for : command not producing .gmo file. + Bug-Debian: https://github.com/tats/w3m/pull/99 + +2018-03-24 Tatsuya Kinoshita + + * table.c: Respect simple_preserve_space for table cells. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893902 + +2018-03-23 Mike + + Update grammar & spelling in some English READMEs. + Origin: https://github.com/tats/w3m/pull/97 + + * doc/README.img: Update README.img. + * doc/README.dict: Update README.dict. + * doc/README.pre_form: Update README.pre_form. + * doc/README.cookie: Update README.cookie. + * doc/README.cookie: Update README.cookie. + +2018-03-04 Jia Zhouyang + + Fix crashes when some external APIs fail. + Origin: https://github.com/tats/w3m/pull/96 + + * url.c: Add error handling code for fopen. + Check the return code of fopen, and return when it fails. + * file.c: Add error handling code for fopen. + Check the return value of fopen, and add proper error handling code. + * local.c: Add error handling for chdir. + When chdir fails, print error message and exit. + +2018-01-25 Tatsuya Kinoshita + + * ChangeLog, NEWS: Add CVE IDs. + cf. https://security-tracker.debian.org/tracker/source-package/w3m + +2018-01-21 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * scripts/Makefile.in: Do not remove w3mdict.cgi when "make distclean". + + * config.h.dist, config.h.in, configure, configure.ac, main.c, rc.c: + Make temporary directory safely when ~/.w3m is unwritable. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888097 + [CVE-2018-6198] + + * rc.c: Suppress error messages when ~/.w3m is unwritable. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=871425 + +2018-01-20 Tatsuya Kinoshita + + * config.guess, config.sub: + Update config.* with autotools-dev 20171216.1. + + * table.c: Prevent negative indent value in feed_table_block_tag(). + Bug-Debian: https://github.com/tats/w3m/issues/88 [CVE-2018-6196] + +2018-01-06 Tatsuya Kinoshita + + * doc-jp/README.SSL: Doc fix for ssl_forbid_method. + + * po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po, po/zh_TW.po, rc.c: + * url.c: Fix multi-character character constant for ssl_forbid_method. + +2018-01-06 se + + * po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po, po/zh_TW.po, rc.c: + * url.c: Extend ssl_forbid_method to disable TLSv1.1. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874218#5 + +2018-01-06 Tatsuya Kinoshita + + * w3mimg/fb/fb_w3mimg.c: Accept TERM=fbterm. + cf. https://bushowhige.blogspot.jp/2015/01/fbterm-w3m-img.html + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590668 + +2017-12-27 Tatsuya Kinoshita + + * form.c: Prevent invalid columnPos() call in formUpdateBuffer(). + Bug-Debian: https://github.com/tats/w3m/issues/89 [CVE-2018-6197] + + * main.c: Typo fix in fusage(). + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878106 + + * doc-jp/README.tab, doc/README.tab, main.c: English fix. + cf. [emacs-w3m:12706], http://emacs-w3m.namazu.org/ml/msg12598.html + +2017-12-24 HIGUCHI Daisuke (VDR dai) + + * scripts/w3mman/w3mman.1.in, terms.c: Fix spelling error. + +2017-08-27 Kyle J. McKay + + Correct parsing and do not turn a form's GET into POST. + Bug-Debian: https://github.com/tats/w3m/pull/93 + + * form.c: + form.c: do not gratuitously turn GET into POST. + When encountering a
tag that contains these values: + method="get" enctype="multipart/form-data" + Do not transform the method into POST to accomodate enctype. + Instead behave in the compatible way that all other browsers + behave in this instance and ignore the enctype parameter + (treating it as the default application/x-www-form-urlencoded) + and perform a "GET" just as the method parameter requests. + This behavior produces far more compatible results than + gratuitously changing the "get" into a "post" which can + result in unexpected "405 Method Not Allowed" errors. + Signed-off-by: Kyle J. McKay + + * file.c: + file.c: compute correct base URL when not absolute. + When a server makes use of the PATH_INFO feature in a CGI, + the returned pages may often have a tag + specifying the URL of the CGI itself as the base. + However, to avoid hard-coding the scheme and host into such + a base href, the href value will often omit the scheme, host + and port. + Make sure that when parsing any such base href value that + any omitted components are taken from the current URL rather + than taken as being from a bare, absolute file:/// URL. + Signed-off-by: Kyle J. McKay + +2017-01-02 Tatsuya Kinoshita + + * NEWS: Update NEWS. + +2016-12-24 Tatsuya Kinoshita + + * libwc/wtf.c: + Prevent overflow beyond the end of string in wtf_parse1(). + Bug-Debian: https://github.com/tats/w3m/issues/68 + + * libwc/wtf.c: + Revert "Prevent overflow beyond the end of string in wtf_parse1()". + This reverts commit 998b6f91d4b02e8bf90b7744dfabc8cccdf9d4f9. + Bug-Debian: https://github.com/tats/w3m/issues/86 + cf. http://emacs-w3m.namazu.org/ml/msg12505.html + + * form.c: + Preserve one byte for end of string character in form_update_line(). + Bug-Debian: https://github.com/tats/w3m/issues/68#issuecomment-266214643 + + * form.c: + Prevent invalid form_update_line() call in formUpdateBuffer(). + Bug-Debian: https://github.com/tats/w3m/issues/82 + +2016-12-20 Tatsuya Kinoshita + + * form.c: + Revert "Preserve one byte for end of string character in form_update_line()". + This reverts commit a4152aaaea5cb51c9018880a1295e498c38889bf. + +2016-12-18 Tatsuya Kinoshita + + * file.c: Prevent heap-use-after-free read in HTMLlineproc0(). + Bug-Debian: https://github.com/tats/w3m/issues/81 + + * file.c: Prevent infinite loop in feed_textarea(). + Bug-Debian: https://github.com/tats/w3m/issues/85 + + * form.c: + Revert "Prevent overflow beyond the end of string in form_update_line()". + This reverts commit 9ccaa1dd0dac6f9b35a649ae9901c225421500f6. + + * form.c: + Revert "Prevent overflow beyond the end of string in form_update_line()". + This reverts commit e0efc127ff20cbeb931847af1c9b353056340fbd. + +2016-12-15 Tatsuya Kinoshita + + * libwc/wtf.c: + Prevent overflow beyond the end of string for wtf to wcs macros. + Bug-Debian: https://github.com/tats/w3m/issues/77 + + * libwc/wtf.c: + Revert "Prevent overflow beyond the end of string for wtf to wcs macros". + This reverts commit b4d27ba5ccffaa38e968c2bf3a8eeb9cd43928ff. + + * file.c, libwc/wtf.c, libwc/wtf.h: + Prevent overflow beyond the end of string in caller of get_mclen(). + Bug-Debian: https://github.com/tats/w3m/issues/59 + Bug-Debian: https://github.com/tats/w3m/issues/73 + Bug-Debian: https://github.com/tats/w3m/issues/74 + Bug-Debian: https://github.com/tats/w3m/issues/75 + Bug-Debian: https://github.com/tats/w3m/issues/76 + Bug-Debian: https://github.com/tats/w3m/issues/78 + Bug-Debian: https://github.com/tats/w3m/issues/79 + Bug-Debian: https://github.com/tats/w3m/issues/80 + Bug-Debian: https://github.com/tats/w3m/issues/83 + Bug-Debian: https://github.com/tats/w3m/issues/84 + + * file.c: + Revert "Prevent overflow beyond the end of string in proc_mchar()". + This reverts commit 512ed467d12615f5ef40d0d28272e5662d8438ea. + + * table.c: + Revert "Prevent overflow beyond the end of string in visible_length()". + This reverts commit a932f78a6d8c105036ffeedf01215c1f6a0e0b71. + + * table.c: + Revert "Prevent overflow beyond the end of string in skip_space()". + This reverts commit e757b43bcf8c439c167f62b6d3317ee9518cabbf. + + * table.c: + Revert "Prevent overflow beyond the end of string in visible_length_plain()". + This reverts commit f763b8ebf5441cb44d2c0234565fadd5eb1c87a5. + + * form.c: + Revert "Prevent overflow beyond the end of string in textfieldrep()". + This reverts commit 77d8d8d6576d8afc0f6b2e09bb88c7ca9dba58bb. + + * file.c: + Revert "Prevent overflow beyond the end of string in proc_mchar()". + This reverts commit e79d0ec2a00369a6af24007a1f2bb5e876e2c847. + +2016-12-13 Tatsuya Kinoshita + + * file.c: Prevent overflow beyond the end of string in proc_mchar(). + Bug-Debian: https://github.com/tats/w3m/issues/80 + cf. https://github.com/tats/w3m/issues/59 + + * form.c: Prevent overflow beyond the end of string in textfieldrep(). + Bug-Debian: https://github.com/tats/w3m/issues/79 + + * form.c: + Preserve one byte for end of string character in form_update_line(). + Bug-Debian: https://github.com/tats/w3m/issues/82 + cf. https://github.com/tats/w3m/issues/68#issuecomment-266214643 + +2016-12-10 Tatsuya Kinoshita + + * libwc/wtf.c: Prevent overflow beyond the end of string in wtf_len(). + cf. https://github.com/tats/w3m/issues/57 + + * etc.c: Prevent negative array index for realColumn in calcPosition(). + Bug-Debian: https://github.com/tats/w3m/issues/69 + + * libwc/wtf.c: + Prevent overflow beyond the end of string in wtf_parse1(). + Bug-Debian: https://github.com/tats/w3m/issues/68 + + * Str.c: Prevent heap-buffer-overflow in Strnew_size(). + Bug-Debian: https://github.com/tats/w3m/issues/72 + + * table.c: + Prevent overflow beyond the end of string in visible_length_plain(). + Bug-Debian: https://github.com/tats/w3m/issues/76 + + * libwc/wtf.c: + Prevent overflow beyond the end of string for wtf to wcs macros. + Bug-Debian: https://github.com/tats/w3m/issues/77 + + * form.c: + Prevent overflow beyond the end of string in form_update_line(). + Bug-Debian: https://github.com/tats/w3m/issues/78 + +2016-12-08 Tatsuya Kinoshita + + * form.c: + Prevent overflow beyond the end of string in form_update_line(). + Bug-Debian: https://github.com/tats/w3m/issues/75 + + * table.c: Prevent overflow beyond the end of string in skip_space(). + Bug-Debian: https://github.com/tats/w3m/issues/74 + + * table.c: + Prevent overflow beyond the end of string in visible_length(). + Bug-Debian: https://github.com/tats/w3m/issues/73 + + * libwc/wtf.c: + Prevent overflow beyond the end of string in wtf_strwidth(). + Bug-Debian: https://github.com/tats/w3m/issues/57 + + * libwc/wtf.c: + Revert "Prevent overflow beyond the end of string in wtf_strwidth()". + This reverts commit d345c0950dfdef065b7377ecad0e4bc1d2601bf8. + +2016-12-07 Tatsuya Kinoshita + + * file.c: Prevent heap-use-after-free in HTMLlineproc0(). + Bug-Debian: https://github.com/tats/w3m/issues/65 + + * file.c: Prevent negative values for offset and pos in push_link(). + Bug-Debian: https://github.com/tats/w3m/issues/64 + + * file.c: Prevent overflow beyond the end of string in proc_mchar(). + Bug-Debian: https://github.com/tats/w3m/issues/59 + + * libwc/wtf.c: + Prevent overflow beyond the end of string in wtf_strwidth(). + Bug-Debian: https://github.com/tats/w3m/issues/57 + +2016-12-05 Yixun Lan + + * html.h: Explictily include to avoid build err. + While disable ssl, we will got a undefine time_t err. + Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=601498 + Origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee43ba4e036db70fff258f3edb2f0335385e93f + +2016-12-05 Tatsuya Kinoshita + + * table.c: + Prevent array index out of bounds for tridvalue in feed_table_tag(). + Bug-Debian: https://github.com/tats/w3m/issues/71 + + * table.c: Prevent negative array index in set_integered_width(). + Bug-Debian: https://github.com/tats/w3m/issues/70 + + * table.c: + Prevent array index out of bounds for tabattr in feed_table_tag(). + Bug-Debian: https://github.com/tats/w3m/issues/60 + + * file.c: Prevent negative array index in process_textarea(). + Bug-Debian: https://github.com/tats/w3m/issues/58 + + * file.c: + Prevent negative array index for marks in HTMLlineproc2body(). + Bug-Debian: https://github.com/tats/w3m/issues/61 + + * file.c: + Prevent negative value of row for pushTable() in HTMLlineproc0(). + Bug-Debian: https://github.com/tats/w3m/issues/67 + + * file.c: Prevent negative array index in getMetaRefreshParam(). + Bug-Debian: https://github.com/tats/w3m/issues/63 + + * anchor.c: + Prevent negative array index for marks in shiftAnchorPosition(). + Bug-Debian: https://github.com/tats/w3m/issues/62 + +2016-11-27 Kuang-che Wu + + * file.c: Fix uninitialized variable in process_img(). fix #44. + Bug-Debian: https://github.com/tats/w3m/issues/44 + Origin: https://github.com/tats/w3m/pull/50/commits/41a607b06e4475101de59e5c623b9e5f76594a21 + + * menu.c: Fix menu buffer-overflow. + Origin: https://github.com/tats/w3m/pull/49/commits/7e1c05dd90cf42a308e854881ea3813aed000d2e + +2016-11-27 Tatsuya Kinoshita + + * ChangeLog, NEWS: Add CVE IDs. + cf. https://security-tracker.debian.org/tracker/source-package/w3m + http://www.openwall.com/lists/oss-security/2016/11/24/1 + +2016-11-20 Tatsuya Kinoshita + + * NEWS: Update NEWS. + +2016-11-19 Tatsuya Kinoshita + + * NEWS: Update NEWS. + +2016-11-18 Tatsuya Kinoshita + + * ChangeLog, NEWS: Add CVE IDs. + cf. https://security-tracker.debian.org/tracker/source-package/w3m + http://www.openwall.com/lists/oss-security/2016/11/18/3 + + * libwc/ucs.map: Fix type mismatch for pcsw_ucs_map_size. + cf. https://github.com/tats/w3m/issues/43 + + * libwc/ucs.c, libwc/ucs.map: + Prevent global-buffer-overflow in wc_any_to_ucs(). + Bug-Debian: https://github.com/tats/w3m/issues/43 [CVE-2016-9632] + +2016-11-17 Tatsuya Kinoshita + + * url.c: Prevent global-buffer-overflow in parseURL(). + Bug-Debian: https://github.com/tats/w3m/issues/41 [CVE-2016-9630] + + * file.c: Prevent deref null pointer in HTMLlineproc0(). + Bug-Debian: https://github.com/tats/w3m/issues/42 [CVE-2016-9631] + +2016-11-15 Tatsuya Kinoshita + + * table.c: Prevent deref null pointer in renderCoTable(). + Bug-Debian: https://github.com/tats/w3m/issues/20#issuecomment-260649537 + + * file.c, proto.h, table.c: + Prevent infinite recursion with nested table and textarea. + Bug-Debian: https://github.com/tats/w3m/issues/20#issuecomment-260590257 + [CVE-2016-9439] + + * table.c: + Revert "Prevent infinite recursion with nested table and textarea". + This reverts commit f393faf55975a94217df479e1bd06ee4403c6958. + + * anchor.c: Prevent deref null pointer in shiftAnchorPosition(). + Bug-Debian: https://github.com/tats/w3m/issues/40 [CVE-2016-9629] + +2016-11-14 Tatsuya Kinoshita + + * file.c: Prevent null pointer deref due to bad form id. + Bug-Debian: https://github.com/tats/w3m/issues/39 [CVE-2016-9628] + + * display.c, file.c, fm.h, symbol.c: + Prevent array index out of bounds for symbol. + Bug-Debian: https://github.com/tats/w3m/issues/38 [CVE-2016-9627] + +2016-11-13 Tatsuya Kinoshita + + * file.c: + Prevent null pointer dereference in HTMLlineproc2body for textarea_int. + Bug-Debian: https://github.com/tats/w3m/issues/32#issuecomment-260170163 + +2016-11-12 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * table.c: Prevent infinite recursion with nested table and textarea. + Bug-Debian: https://github.com/tats/w3m/issues/20 + +2016-11-09 Tatsuya Kinoshita + + * table.c: Check indent_level to prevent infinite recursion. + Bug-Debian: https://github.com/tats/w3m/issues/37 [CVE-2016-9626] + +2016-11-07 Tatsuya Kinoshita + + * file.c: Prevent infinite recursion in HTMLlineproc0. + Bug-Debian: https://github.com/tats/w3m/issues/36 [CVE-2016-9625] + + * NEWS, w3m-doc/install.html.in: + Update documents for included w3mdict.cgi. + +2016-11-07 ITOH Yasufumi + + * main.c: Fix suspend (^Z) behavior. + Suspend the job w3m belongs to, not w3m only. + Signed-off-by: Thomas Klausner + Bug-Debian: https://github.com/tats/w3m/pull/34 + Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/w3m/patches/patch-ab?rev=1.4&content-type=text/x-cvsweb-markup + +2016-11-07 Tatsuya Kinoshita + + * form.c: Prevent dereference near-null pointer in formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/35 [CVE-2016-9624] + + * file.c: Prevent crash after allocate string of negative size. + Bug-Debian: https://github.com/tats/w3m/issues/33 [CVE-2016-9623] + + * file.c: Prevent memory exhausted due to repeat appending "". + Bug-Debian: https://github.com/tats/w3m/issues/23 [CVE-2016-9633] + + * file.c: Prevent null pointer dereference in HTMLlineproc2body. + Bug-Debian: https://github.com/tats/w3m/issues/32 [CVE-2016-9622] + +2016-10-31 Tatsuya Kinoshita + + * table.c, table.h, textlist.h: + Revert "Treat table height as int instead of short". + This reverts commit 0c9aebb26a16ad3acc69b2e87ffd216d43879cb6. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842623 + +2016-10-30 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * fm.h: Set use_dictcommand to 1 by default. + + * scripts/Makefile.in: Add w3mdict.cgi to LIB_TARGETS. + + * config.h.dist: Typo fix for USE_DICT. + +2016-10-30 Boruch Baum + + * scripts/w3mdict.cgi: Add w3mdict.cgi to use a dictd dictionary query. + Bug-Debian: https://github.com/tats/w3m/issues/30 + +2016-10-09 Tatsuya Kinoshita + + * form.c: + Fix incorrect dereference in formUpdateBuffer when MENU_SELECT. + cf. https://github.com/tats/w3m/commit/ec9eb22e008a69ea9dc21fdca4b9b836679965ee + https://github.com/tats/w3m/issues/28 + +2016-10-08 Tatsuya Kinoshita + + * table.c, table.h, textlist.h: + Treat table height as int instead of short. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838952 + + * form.c: Prevent global-buffer-overflow write in formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/29 [CVE-2016-9429] [CVE-2016-9621] + + * form.c: Fix null pointer dereference in formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/28 [CVE-2016-9443] + +2016-08-30 Kuang-che Wu + + * Str.c: Fix potential heap buffer corruption due to Strgrow. + Origin: https://github.com/tats/w3m/pull/27 [CVE-2016-9442] + +2016-08-29 Tatsuya Kinoshita + + * anchor.c: + Prevent segfault due to buffer overflows in addMultirowsForm. + Bug-Debian: https://github.com/tats/w3m/issues/21 [CVE-2016-9425] + Bug-Debian: https://github.com/tats/w3m/issues/26 [CVE-2016-9428] + + * form.c: Prevent segfault for formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/13#issuecomment-242981906 + +2016-08-24 Tatsuya Kinoshita + + * table.c: Prevent segfault with malformed table_alt. + Bug-Debian: https://github.com/tats/w3m/issues/24 [CVE-2016-9441] + + * form.c: Prevent segfault for formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/22 [CVE-2016-9440] + + * table.c: Truncate max_width for renderTable. + Bug-Debian: https://github.com/tats/w3m/issues/25 [CVE-2016-9426] + +2016-08-20 Tatsuya Kinoshita + + * file.c, parsetagx.c: Fix uninitialised values for and
. + Bug-Debian: https://github.com/tats/w3m/issues/16 + [CVE-2016-9435] [CVE-2016-9436] + + * file.c, parsetagx.c: + Revert "Fix uninitialised values for and
". + This reverts commit 0fba2f1a6eb6861206ad120a02af2643938082cd. + cf. https://github.com/tats/w3m/commit/0fba2f1a6eb6861206ad120a02af2643938082cd#commitcomment-18703355 + +2016-08-19 Tatsuya Kinoshita + + * file.c, parsetagx.c: Fix uninitialised values for and
. + Bug-Debian: https://github.com/tats/w3m/issues/16 + +2016-08-18 Kuang-che Wu + + * table.c: Fix table rowspan and colspan. + Origin: https://github.com/tats/w3m/pull/19 + Bug-Debian: https://github.com/tats/w3m/issues/8 [CVE-2016-9422] + +2016-08-18 Tatsuya Kinoshita + + * file.c: Prevent segfault with malformed input_alt. + Bug-Debian: https://github.com/tats/w3m/issues/18 [CVE-2016-9438] + + * file.c: Prevent segfault with incorrect button type. + Bug-Debian: https://github.com/tats/w3m/issues/17 [CVE-2016-9437] + +2016-08-17 Tatsuya Kinoshita + + * file.c: Prevent segfault with incorrect form_int fid. + Bug-Debian: https://github.com/tats/w3m/issues/15 [CVE-2016-9434] + + * libwc/iso2022.c: Prevent segfault when iso2022 parsing. + Bug-Debian: https://github.com/tats/w3m/issues/14 [CVE-2016-9433] + + * form.c: Prevent segfault for formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/13 [CVE-2016-9432] + + * file.c, form.c: + Prevent negative array index for selectnumber and textareanumber. + Bug-Debian: https://github.com/tats/w3m/issues/12 [CVE-2016-9424] + +2016-08-16 Tatsuya Kinoshita + + * file.c: Truncate large values of table attributes. + Bug-Debian: https://github.com/tats/w3m/issues/11 + +2016-08-15 Tatsuya Kinoshita + + * form.c: Prevent segfault for formUpdateBuffer. + Bug-Debian: https://github.com/tats/w3m/issues/9 [CVE-2016-9423] + Bug-Debian: https://github.com/tats/w3m/issues/10 [CVE-2016-9431] + +2016-08-09 Tatsuya Kinoshita + + * file.c: Prevent segfault with malformed input type. + Bug-Debian: https://github.com/tats/w3m/issues/7 [CVE-2016-9430] + +2016-08-08 Tatsuya Kinoshita + + * Makefile.in, configure, configure.ac, scripts/w3mman/Makefile.in: + Install German manpages. + +2016-08-08 Markus Hiereth + + * doc-de/MANUAL.html, doc/MANUAL.html: + Update MANUAL.html in English and German. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#90 + + * doc-de/FAQ.html, doc/FAQ.html: Update FAQ.html in English and German. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#85 + + * scripts/w3mman/w3mman.1.in, scripts/w3mman/w3mman.de.1.in: + Update manpage for w3mman in English and German. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#80 + + * doc-de/w3m.1, doc/w3m.1: + Update manpage for w3m in English and German. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#75 + +2016-07-18 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * fm.h: Set default_url to 1 by default. + +2016-06-20 Tatsuya Kinoshita + + * doc-de/README.func, scripts/w3mhelp-funcdesc.de.pl.in: + Trim trailing spaces. + +2016-06-20 Markus Hiereth + + * doc-de/README.func, scripts/w3mhelp-funcdesc.de.pl.in: + Update German help messages. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682#47 + +2016-06-19 Tatsuya Kinoshita + + * doc-de/README.func, scripts/w3mhelp-funcdesc.de.pl.in: + Convert German help messages to UTF-8. + + * main.c: Update description of SOURCE and VIEW. + +2016-06-19 Markus Hiereth + + * doc-de/README.func, doc/README.func: + Update description of SOURCE and VIEW. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682#37 + +2016-06-19 Tatsuya Kinoshita + + * NEWS: Update NEWS. + + * doc-de/README.func: Update German messages. + + * doc/README.func, main.c, menu.c: Update English messages. + + * doc-jp/README.func, scripts/w3mhelp-funcdesc.ja.pl.in: + Update Japanese help messages. + +2016-06-19 Markus Hiereth + + * doc-de/README.func, scripts/w3mhelp-funcdesc.de.pl.in: + Update German help messages. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682 + + * doc/README.func, scripts/w3mhelp-funcdesc.en.pl.in: + * scripts/w3mhelp.cgi.in: Update English help messages. + +2016-05-11 Tatsuya Kinoshita + + * config.guess, config.sub: + Update config.* with autotools-dev 20160430.1. + +2016-04-14 Tatsuya Kinoshita + + * doc-de/README.func, doc-jp/README.func, doc/README.func: + * w3m-doc/sample/keymap.cgi: Cleanup obsolete INIT_MAILCAP. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820902 + + * NEWS: Update NEWS. + +2016-04-08 Tatsuya Kinoshita + + * libwc/johab.c: Fix segfault on bogus text for wc_N_to_johab1. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820373 + +2016-04-07 Tatsuya Kinoshita + + * libwc/map/big5_ucs.map, libwc/map/cns11643_ucs.map: + * libwc/map/gb12345_ucs.map, libwc/map/gb2312_ucs.map: + * libwc/map/gbk_ucs.map, libwc/map/hkscs_ucs.map: + * libwc/map/jisx0208x0212x0213_ucs.map, libwc/map/ksx1001_ucs.map: + * libwc/map/sjis_ext_ucs.map, libwc/map/uhc_ucs.map, libwc/ucs.c: + * libwc/ucs.map: Fix segfault on bogus text for wc_any_to_ucs. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820162 + +2016-04-03 Tatsuya Kinoshita + + * doc/FAQ.html, doc/MANUAL.html: Update English documents. + +2016-04-03 Markus Hiereth + + * doc/FAQ.html, doc/MANUAL.html: Update English documents. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#25 + +2016-04-02 Tatsuya Kinoshita + + * configure, configure.ac, doc-de/README.func, scripts/Makefile.in: + * scripts/w3mhelp-funcdesc.de.pl.in, scripts/w3mhelp.cgi.in: + Support German translated help messages (translation is in progress). + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682 + + * doc-jp/w3m.1, doc/w3m.1: Update manpage footers to w3m 0.5.3. + + * doc-jp/MANUAL.html, doc-jp/w3m.1, w3m-doc/outline.html.in: + * w3mhelp-lynx_ja.html.in, w3mhelp-w3m_ja.html.in: + Update Japanese documents for extbrowser4..9. + +2016-04-02 Justin B Rye + + * doc/FAQ.html, doc/MANUAL.html, doc/README.func, doc/menu.submenu: + * main.c, menu.c, scripts/w3mhelp-funcdesc.ja.pl.in: + * scripts/w3mhelp.cgi.in, w3mhelp-lynx_en.html.in: + * w3mhelp-w3m_en.html.in: English fixes. + cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#15 + Origin: https://lists.debian.org/debian-l10n-english/2014/12/msg00002.html + Origin: https://lists.debian.org/debian-l10n-english/2014/12/msg00030.html + Origin: https://lists.debian.org/debian-l10n-english/2015/02/msg00011.html + +2016-03-30 Leo Famulari + + * url.c: Disable RC4. + Origin: http://git.savannah.gnu.org/cgit/guix.git/commit/?id=62339e2d493bf87a3aabe12e45458581e9705d83 + +2016-03-29 Tatsuya Kinoshita + + * url.c: Fix variable is reassigned a value before the old one has + been used. + + * regex.c: Fix printf format specifier mismatch when REGEX_DEBUG. + + * w3mimg/fb/fb.c: Fix invalid braces when not Linux or FreeBSD. + + * local.c: Fix uninitialized variable when not HAVE_PUTENV. + + * w3mimgdisplay.c: Fix realloc mistake for DrawImage. + + * file.c: Fix mistake of unescape spaces for _doFileCopy. + cf. [w3m-dev-en 00751], [w3m-dev-en 00752] on 2002-06-09 + + * url.c: Fix style of array index is used before limits check. + Bug: https://sourceforge.net/p/w3m/feature-requests/25/ + +2016-03-22 Tatsuya Kinoshita + + * menu.c, proto.h: Fix build failure when not USE_MOUSE for sgrmouse. + cf. https://twitter.com/naota344/status/711541592167854081 + +2016-03-20 Tatsuya Kinoshita + + * rc.c: Fix reverse ordered config parameters. + +2016-03-19 Tatsuya Kinoshita + + * doc/FAQ.html: Update FAQ for extbrowser. + +2016-03-14 Tatsuya Kinoshita + + * po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po, po/zh_TW.po, rc.c: + Update PO strings for extbrowser2..9. + +2016-03-13 Tatsuya Kinoshita + + * acinclude.m4, configure: + Set firefox instead of mozilla to default browser. + + * po/Makefile.in.in, po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po: + * po/zh_TW.po: Update PO strings for extbrowser4..9. + + * doc-jp/MANUAL.html, doc/MANUAL.html, fm.h, main.c, rc.c: + Add extbrowser4, extbrowser5, ..., and extbrowser9. + e.g. + - extbrowser8 url=%s && printf %s "$url" | xsel && printf %s "$url" | xsel -b & + - extbrowser9 mpv %s & + cf. https://github.com/spcmd/w3m + +2016-02-28 Tatsuya Kinoshita + + * menu.c: Fix SIGFPE for ACCESSKEY. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779092 + + * doc/README.func, main.c: Typo fix for ACCESSKEY. + cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779092#5 + +2015-12-20 Franz Thoma + + * w3mimg/x11/x11_w3mimg.c: Fix semi-transparent artifacts in w3m-img + when used with 32-bit color (e.g. urxvt). + imlib_render_image_on_drawable_at_size() tended to leave nasty + semi-transparent artifacts in 32-bit mode. Apparently, resizing an + image in 32-bit mode affects the alpha channel even if there is no + transparency in the image. With this patch, resizing is done in + 24-bit mode (or whatever depth the original image has) before + converting the image to 32-bit and rendering it on the display. + Origin: https://gist.github.com/fmthoma/f76a1b44e00d5ca972bb + cf. https://github.com/hut/ranger/issues/86#issuecomment-166027119 + +2015-12-17 Tatsuya Kinoshita + + * w3mimg/x11/x11_w3mimg.c: + Wrap render_pixbuf_to_pixmap_32() in USE_GTK2. + +2015-12-17 Araki Ken + + * w3mimg/x11/x11_w3mimg.c: + w3mimgdisplay supports 32 bit depth screen. (e.g. gnome-terminal) + Origin: https://bitbucket.org/arakiken/w3m/commits/f9c22db8cfd1aaba9bb7301ef9ba51ed88d8bb40 + +2015-12-17 Tatsuya Kinoshita + + * w3mimg/x11/x11_w3mimg.c: + Revert "Fix handling visuals and colormaps incorrectly". + This reverts commit e24b4064daf3e022e370788a8c7267db40c37dda. + +2015-11-19 Tatsuya Kinoshita + + * fm.h: Accept cookies by default. + + * fm.h: Set argv_is_url to 1 by default. + Bug-Arch: https://bugs.archlinux.org/task/47102 + +2015-11-18 Tatsuya Kinoshita + + * config.guess, config.sub: + Update config.* with autotools-dev 20150820.1. + +2015-11-11 Mingye Wang (Arthur2e5) + + * po/LINGUAS, po/zh_CN.po, po/zh_TW.po: + Add zh_CN and zh_TW translations. + Please note that the zh_TW translation is machine-converted using + OpenCC from zh_CN, and needs to be further polished by actual zh_TW + speakers. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804732#10 + +2015-10-24 BwackNinja + + * w3mimg/x11/x11_w3mimg.c: + Fix handling visuals and colormaps incorrectly. + cf. https://github.com/hut/ranger/issues/86 + Origin: https://gist.github.com/BwackNinja/60a344730170f9ce2163 + Bug-Arch: https://bugs.archlinux.org/task/46836 + Bug: https://sourceforge.net/p/w3m/patches/72/ + +2015-10-10 Tatsuya Kinoshita + + * cookie.c: Remove incomplete special_domain tests. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=385702 + +2015-10-04 Gaetan Bisson + + * scripts/w3mhelp.cgi.in: Do not use defined(%hash). + Origin: https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/w3m&id=d9e0a4f0b461c9e2177cd9e64a10581386650503 + Bug-Arch: https://bugs.archlinux.org/task/45608 + +2015-09-06 Tatsuya Kinoshita + + * file.c: Do not use C99-style comments. + +2015-09-06 David Crosby + + * file.c: Mitigate issue #16 found by @kcwu. + * table.c: Fix stack overflow found by @kcwu. + Origin: https://github.com/dafyddcrosby/sw3m + Bug-sw3m: https://github.com/dafyddcrosby/sw3m/issues/16 + +2015-08-21 Tatsuya Kinoshita + + * doc-jp/keymap.lynx, doc/keymap.lynx: Fix unknown key. + Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/265144 + Bug: https://sourceforge.net/p/w3m/bugs/48/ + +2015-08-11 David Crosby + + Fix resource leaks, dead assignments, divide-by-zero, and so on. + Origin: https://github.com/dafyddcrosby/sw3m + + * buffer.c: Check for presence of prevl before using. + + * html.h: Adjust UFclose to remove false positive of CWE-481. + + * ftp.c: Move sockent for splint. + + * cookie.c: Use unsigned int for max_count. + + * libwc/iso2022.c: Add missing comparision that made if always true. + + * Str.c: Use fgetc in while loops, use int instead of char. + + * mailcap.c: Adjust len to size_t. + + * history.c: Check return value of rename. + + * main.c: Adjust while loop. + + * news.c: Check dup call for errors. + + * file.c: Remove unused value. + + * ftp.c: dup can give a negative value. + + * main.c: Use int for c. + + * table.c: Initialize new_tabwidth at declaration. + + * local.c: Remove overflow on readlink. + + * anchor.c, file.c, istream.c, main.c, menu.c, rc.c, table.c, terms.c: + * url.c: Remove dead assignments flagged by Clang static analysis. + + * w3mbookmark.c: + Move fclose to fix dereference after null check (Coverity). + + * file.c: Fix resource leak in AuthDigestCred. + + * buffer.c: Fix resource leak in readBufferCache. + + * cookie.c: Fix resource leak in load_cookies. + + * frame.c: Fix resource leak. + + * w3mhelperpanel.c: Fix resource leak. + + * w3mbookmark.c: Fix resource leak and a null return value dereference. + + * linein.c: Fix a divide-by-zero. + + * cookie.c: Change total_dot_number to unsigned int. + + * cookie.c: Free tmp. + + * local.c: Remove unreachable return. + +2015-08-10 Alan Grow + + * url.c (HTTPrequest): + - Use Content-Type instead of Content-type. + - Use Content-Length instead of Content-length. + Origin: https://github.com/acg/w3m/commit/5946c2784d4eae46ec06e52390e43a874b3395fc + +2015-08-09 Egmont Koblinger + + * terms.c: Support sgrmouse for skip_escseq. + * menu.c: Adjust comments for keymaps. + Origin: https://sourceforge.net/p/w3m/patches/65/#e2aa + +2015-08-09 Tatsuya Kinoshita + + * keybind_lynx.c: Support sgrmouse for Lynx-like key binding. + cf. https://sourceforge.net/p/w3m/patches/65/ + +2015-08-09 IWAMOTO Kouichi + + * menu.c: Support SGR style mouse handler for menu. + cf. https://github.com/tats/w3m/issues/5 + Origin: https://gist.github.com/ttdoda/83fbcf676a21da28432b + Bug: https://sourceforge.net/p/w3m/patches/65/ + +2015-08-06 Richard Quirk + + Fix problems reported by cppcheck, clang --analyze and gcc warnings. + Origin: https://github.com/tats/w3m/pull/6 + + * Str.c, Str.h: Strnew_charp and co do not modify the char* input. + + * local.c: Close temp file if pipe open fails. + + * rc.c: Avoid passing null to strlen. + + * file.c: Initialise hidden_input to NULL. + This prevents a possible use of garbage value on line 3017. + + * file.c: Use pclose for pipe. + +2015-08-05 IWAMOTO Kouichi + + * main.c: Fix that SGR style mouse handler has off-by-one problem. + cf. https://github.com/tats/w3m/issues/5 + Origin: https://gist.github.com/ttdoda/30c189a63d483beeb207 + Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/1390768 + Bug: https://sourceforge.net/p/w3m/patches/65/ + +2015-07-31 yshl + + * Bonus/goodict.cgi: + - Use Encode.pm instead of NKF. + - Update to the current URL. + - Enable to select search mode. + Origin: https://github.com/tats/w3m/pull/4 + +2015-07-20 Tatsuya Kinoshita + + * README: Add short description. + + * doc-jp/FAQ.html, doc/FAQ.html: Mention GOPHER_PROXY and FTP_PROXY. + +2015-07-05 Tatsuya Kinoshita + + * doc-jp/FAQ.html, doc/FAQ.html: Mention HTTPS_PROXY. + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791425 + +2015-06-27 yshl + + * doc-jp/README.SSL: Modify certdata2pem.rb to assume the encoding + of the certdata.txt to be UTF-8. + Origin: https://github.com/tats/w3m/pull/3 + +2015-06-23 Daniel Schepler + + * terms.c: Wrap the functions used by image.c in USE_IMAGE. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789539 + +2015-05-09 Tatsuya Kinoshita + + * doc-jp/README.siteconf, doc/README.siteconf: + Update examples of siteconf for twitter.com. + +2015-05-03 Tatsuya Kinoshita + + * main.c: Correct GC version confirmation. + +2015-05-02 yshl + + * main.c: Correct GC version confirmation. + Origin: https://github.com/tats/w3m/pull/2 + +2015-04-29 Markus Hiereth + + * po/de.po: Update German translation. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=783383 + +2015-04-29 Tatsuya Kinoshita + + * po/Makevars, po/de.po, po/ja.po, po/w3m.pot, rc.c: + Update PO strings for display_borders. + +2015-04-26 yshl + + * main.c: Use GC_oom_fn instead of GC_set_oom_fn for gc-7.1. + Origin: https://github.com/tats/w3m/pull/1 + +2015-02-03 Tatsuya Kinoshita + + * po/de.po, po/ja.po, po/w3m.pot: Update PO. + +2015-02-02 Tatsuya Kinoshita + + * file.c, fm.h, rc.c: + New option "display_borders" to display 0 pixel table borders. + cf. http://d.hatena.ne.jp/rubikitch/20101120 + +2015-01-24 Tatsuya Kinoshita + + * acinclude.m4, configure, version.c.in: + Update to 0.5.3+gitYYYYMMDD (generate from ChangeLog). + +2015-01-15 Tatsuya Kinoshita + + * alloc.h, main.c: Drop C99 features. + +2015-01-15 Scarlett + + Add overflow detection. + Origin: http://marc.info/?l=openbsd-ports&m=142090828929750&w=2 + * main.c: Call exit(1) when out of memory to avoid dereferencing null + pointers when gc's malloc fails. + * alloc.h: Replacements for w3m's allocation macros which add + overflow detection and concentrate the macros in one file. + * indep.h, libwc/charset.c, libwc/status.c, matrix.c: Use the + overflow-detecting allocation macros from alloc.h. + +2015-01-15 Tatsuya Kinoshita + + * Str.c, cookie.c, map.c: + Do not use C99 printf format specifiers and asprintf. + +2015-01-15 Scarlett + + Correct printf arguments and use asprintf. + Origin: http://marc.info/?l=openbsd-ports&m=142090828929750&w=2 + * Str.c: Use asprintf() instead of rolling our own printf string + length detection. + * cookie.c: Pass the char pointer in the string struct to printf %s + instead of the string struct itself. + Print time_t using %lld instead of %ld to allow for 64-bit time_t. + * main.c: Print a long int using the correct format specifier. + * map.c: Print size_t using the correct format specifier. + +2014-12-06 Araki Ken + + Support OSC 5379 remote imaging and sixel graphics. + Origin: https://bitbucket.org/arakiken/w3m/branch/remoteimg (2014-11-16) + + * doc/README.sixel, terms.c: Add README.sixel. W3M_IMG2SIXEL + environmental variable enables to specify options of img2sixel. + + * image.c, terms.c: + Add n_terminal_image argument to put_image_{sixel|osc5379}(). + Use struct winsize to calculate ppc and ppl. + + * terms.c: If SCREEN_VARIANT=sixel on GNU screen, exec img2sixel + without -P option. + + * terms.c: ttymode_set() -> ttymode_reset(). + + * terms.c: Fix. + + * terms.c: Support GNU screen. + + * terms.c: Show GIF (except animation GIF) correctly. + + * main.c, terms.c: img2sixel exits by Ctrl+C. Enable GIF Animation if + 'I' is pressed to show it. + + * image.c: Add declaration of get_pixel_per_cell(). + + * terms.c: Show the first frame of animation gif files. + + * terms.c: system() -> fork()&execvp() + + * display.c: Draw underline on anchor which contains cboth text and + images. + + * etc.c: Remove close_tty() from setup_child() because close_tty() + sometimes interrupts loadGeneralFile() in loadImage() and corrupt + image data can be cached in ~/.w3m. + + * image.c: Minor fix. + + * image.c: Cache image files if at all possible and convert them to + sixel when -sixel option is specified. + + * image.c: Init pixel_per_{char|line}_i if get_pixel_per_cell() fails. + + * display.c, file.c, fm.h, image.c, main.c, terms.c: + Add -sixel option which supports image processing by img2sixel. + + * image.c: Don't download image files whose size is specified in + tag. + + * image.c: Minor fixes of parseImageHeader(). + + * image.c: Determine the format of an image file by its header data + not by its file name suffix. + + * image.c: Read width and height from jpeg, png and gif files directly + instead of executing w3mimgdisplay -size. + + * display.c: display.c: Draw underline on anchor text which is not + overlapped with any image. + + * terms.c: Clear fd_set by FD_ZERO() before select(). + + * file.c: nw and ni are rounded up instead of rounded off to show + every corner of images. + + * terms.c: Change time to wait for the response of "\x1b[14t\x1b[18t" + from 0.1 sec to 0.5 sec. + + * image.c: + - clearImage() works. + - Use cached image files created by w3m in getImage(). + + * file.c: Hack for alignment. + + * fm.h, image.c, terms.c: + - Adjust the image size to the terminal cell size. + - If the image size is specified in html source, skip to load the image. + + * display.c, fm.h, image.c, main.c, terms.c, w3mimg/x11/x11_w3mimg.c: + Support remote image by OSC 5379 show_picture sequence. + +2014-12-06 Olaf Hering + + * parsetagx.c: Fix crash in parse_tag() during every start. + Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/w3m/w3m-parsetagx-crash.patch?expand=1 + + * fm.h: Change the default to alt_entity=0. + Change the default for the option "Use ASCII equivalents to + display entities" from YES to NO. + Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/w3m/w3m-0.5.1-no-ASCII-equivalents-by-default.patch?expand=1 + Bug-Novell: https://bugzilla.novell.com/show_bug.cgi?id=247397 + + * anchor.c, libwc/gb18030.c, libwc/ucs.c, regex.c: + Fix a few harmless uninitialized variables. + Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/w3m/w3m-uninitialized.patch?expand=1 + +2014-12-06 Peter Poeml + + * terms.c: Prevent segfault when editing a textarea field with vi. + Add fix for segfault that can occur when editing a textarea field + with vi, and returning to w3m (it seems to happen if the terminal + is not writable, as when using w3m after 'su - some_user') + Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/w3m/w3m-0.4.1-textarea-segfault.dif?expand=1 + +2014-12-04 Tatsuya Kinoshita + + * acinclude.m4: Follow updated configure. + +2014-12-03 Yusuke Baba + + * configure, w3mimg/fb/fb.c, w3mimg/fb/fb.h, w3mimg/fb/fb_w3mimg.c: + Support FreeBSD framebuffer. + Origin: http://www.ac.auone-net.jp/~baba/w3m-img/index.html + Bug-FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=122673 + +2014-12-02 Naohiro Aota + + * acinclude.m4, configure, w3mimg/fb/fb_gdkpixbuf.c: + * w3mimg/x11/x11_w3mimg.c: + Depend on gdk-pixbuf instead of gtk when gtk2. + Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.3-gdk-pixbuf.patch?revision=1.1 + +2014-12-02 Jeroen Roovers + + * acinclude.m4, configure: Add tinfo to with_termlib. + Fix building against sys-libs/ncurses[tinfo]. + Origin: https://504588.bugs.gentoo.org/attachment.cgi?id=372650 + Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=504588 + +2014-12-01 OBATA Akio + + * acinclude.m4, configure: + Assume defined PKG_CONFIG points right location when gtk2. + Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/w3m/patches/patch-aa?rev=1.13&content-type=text/x-cvsweb-markup + Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/w3m/patches/patch-ak?rev=1.1&content-type=text/x-cvsweb-markup + +2014-12-01 Vsevolod Stakhov + + * config.h.in: Disable USE_EGD for LibreSSL. + Disable use of RAND_egd as it is absent in FreeBSD. + This also fixes build error with LibreSSL. + Origin: https://bz-attachments.freebsd.org/attachment.cgi?id=144635 + Bug-FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191852 + Bug-FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191956 + +2014-12-01 zimous + + * po/ja.po: Set Language tag properly for Japanese translation. + Origin: https://512722.bugs.gentoo.org/attachment.cgi?id=378452 + Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=512722 + +2014-11-30 Tatsuya Kinoshita + + * doc/w3m.1: Typo fix. + +2014-11-30 Markus Hiereth + + * doc/w3m.1: Miscellaneous changes to improve English manpage. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + +2014-11-29 Markus Hiereth + + * doc/w3m.1: Improve FILES. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=403634 + + * doc/w3m.1: Improve EXAMPLES. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=380560 + + * doc/w3m.1: Improve explanation about option -N. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345084 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530468 + + * doc/w3m.1: Note that -cols only affects when HTML is rendered. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=285251 + + * doc/w3m.1: Add more info on configuration. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#30 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=268211 + +2014-11-29 Justin B Rye + + * scripts/w3mman/w3mman.1.in: Tweak for W3MMAN_W3M. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771003#5 + + * scripts/w3mman/w3mman.1.in: English fixes. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766550#25 + +2014-11-29 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-19+. + +2014-11-29 Justin B Rye + + * scripts/w3mman/w3mman2html.cgi.in: Fix Perl warnings. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771004 + +2014-10-21 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-19 + + * po/LINGUAS: Correct LINGUAS to a whitespace separated list + +2014-10-21 Markus Hiereth + + * po/LINGUAS, po/de.po: Add German translation + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763964 + +2014-10-15 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-18 + + * doc-jp/README.SSL: Update README.SSL to follow default values + + * config.sub: Update config.sub with autotools-dev 20140911.1 + + * fm.h: Disable SSLv3 by default [CVE-2014-3566] + cf. https://blog.mozilla.org/security/2014/10/14/the-poodle-attack-and-the-end-of-ssl-3-0/ + +2014-10-15 Ludwig Nussel + + * fm.h: Force ssl_verify_server on and disable SSLv2 support + Origin: http://www.openwall.com/lists/oss-security/2010/06/14/4 + +2014-10-13 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-17+ + +2014-10-04 Tatsuya Kinoshita + + * libwc/ambwidth_map.awk, libwc/map/ucs_ambwidth.map: + Fix incorrect generation of ucs_ambwidth_map + +2014-08-22 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-17 + + * config.guess: + Update config.guess to 2014-03-23 with autotools-dev 20140510.1 + + * config.sub: + Update config.sub to 2014-05-01 with autotools-dev 20140510.1 + +2014-08-22 Micah Cowan + + * main.c: Support Boehm GC 7.2. + Replace Gentoo's patch to prevent segfaults due to infinite recursion. + Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=080_gc72.patch;att=1;bug=758831 + Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758831 + Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=555467 + Bug: http://sourceforge.net/p/w3m/patches/63/ + Bug: http://sourceforge.net/p/w3m/patches/59/ + +2014-08-22 Tatsuya Kinoshita + + * main.c: + Revert "Support Boehm GC 7.2" (w3m-0.5.2-gc72.patch from Gentoo) + This reverts commit 4331db3e3e673ac4dbfe8e9f2b42a8e0478dc98a. + +2014-06-23 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-16 + + * url.c: Disable ciphers that use keys smaller than 128 bits + Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/1325674 + +2014-01-04 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-15 + +2014-01-03 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-14 + + * acinclude.m4, configure: Use pkg-config to build with imlib2 1.4.6 + + * doc/HISTORY, doc/README.cookie, doc/README.m17n: + Prefer US-ASCII rathar than Japanese encodings in English documents + +2013-12-27 Tatsuya Kinoshita + + * doc-jp/MANUAL.html, doc/MANUAL.html: + Cleanup unusable links in MANUAL.html + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=517315 + + * version.c.in: Update to 0.5.3+debian-13+ + +2013-12-17 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-13 + +2013-12-14 Tatsuya Kinoshita + + * config.guess: + Update config.guess to 2013-06-10 with autotools-dev 20130810.1 + + * config.sub: + Update config.sub to 2013-08-10 with autotools-dev 20130810.1 + +2013-12-07 Reinhard Max + + * local.c: Fix a directory descriptor leak in loadLocalDir. + Patch from openSUSE on 2009-09-07. + Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/w3m/w3m-closedir.patch + Bug-Novell: https://bugzilla.novell.com/show_bug.cgi?id=531675 + +2013-12-07 AIDA Shinra + + * main.c: Fix crash after SEARCH_NEXT. + Patch from , + [w3m-dev:04473] on 2013-12-07. + +2013-11-11 Paul Boekholt + + * file.c: Add support for single quoted meta refresh URL + Bug: https://sourceforge.net/p/w3m/patches/53/ + Bug-NetBSD: http://gnats.netbsd.org/42400 + +2013-11-07 Cristian Rodriguez + + * url.c: Use SSL_OP_NO_COMPRESSION if available. + Due to the "CRIME attack" (CVE-2012-4929) HTTPS clients that + negotiate TLS-level compression can be abused for MITM attacks. + * url.c: Use SSL_MODE_RELEASE_BUFFERS if available. + Patch from openSUSE on 2012-11-12: + https://build.opensuse.org/request/show/141054 + +2013-10-15 Tatsuya Kinoshita + + * Makefile.in: + Depend on funcname.tab to fix parallel make issue of scripts + Bug: https://sourceforge.net/p/w3m/patches/64/ + Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=362249 + + * w3mimg/Makefile.in: + Avoid prerequisite $(IMGOBJS) to fix parallel make issue of w3mimg + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726188 + + * acinclude.m4, configure: + Explicitly add -lX11 to IMGX11LDFLAGS only when gtk2 + Bug: https://sourceforge.net/p/w3m/patches/57/ + + * w3mimg/Makefile.in: Revert "Fix parallel make issue" + This reverts commit aa6f871c6dcc108118142bcc786e4a6ac3d46867. + + * Makefile.in: + Revert "Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5" + This reverts commit 7410954066d68ac2ad6aea638801714447321fec. + +2013-10-14 AIDA Shinra + + * url.c: Define schemeNumToName() to fix scheme bug. + Patch from , + [w3m-dev:04470] on 2013-10-14. + Bug: https://sourceforge.net/p/w3m/patches/60/ + + * config.h.in, file.c, fm.h, html.h, image.c, indep.c, indep.h: + * istream.c, istream.h, local.c, main.c, mimehead.c, proto.h: + Workaround of GC crash on Cygwin64. + Patch from , + [w3m-dev:04469] on 2013-10-14. + +2013-10-14 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-12+ + +2013-10-14 Jarek Czekalski + + * terms.c: Fix paren in check_cygwin_console() + Bug: https://sourceforge.net/p/w3m/patches/66/ + +2013-10-13 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-12 + + * doc-jp/MANUAL.html, doc-jp/w3m.1, doc/MANUAL.html, doc/w3m.1: + Update document for the -s option change + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=75527 + + * terms.c: Do not fail when LANG is not set. + Check whether the value of LC_ALL, LC_CTYPE or LANG is not NULL in + check_cygwin_console(). + Bug: https://sourceforge.net/p/w3m/patches/66/ + +2013-10-12 Tatsuya Kinoshita + + * table.h: Bump MAXCOL to 256 + Bug: https://sourceforge.net/p/w3m/feature-requests/24/ + +2013-10-12 Laurence Richert + + * main.c, proto.h: vim/-perator like handling + - half page scrolling + - jumping to elements numbered by getLinkNumberStr() from Karsten + Schoelzel + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724028 + +2013-10-12 Tatsuya Kinoshita + + * doc-jp/README, doc/README: + Mention project page rather than unavailable mailing lists + +2013-10-09 Rafael Laboissiere + + * doc/README.img: Fix typo + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725892 + +2013-08-12 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-11+ + + * ChangeLog: Update ChangeLog to use contributor's name + +2013-08-08 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-11 + +2013-08-04 Tatsuya Kinoshita + + * Str.c: Check length for Strchop() + + * main.c: Fix potentially segfault of execdict() + + * version.c.in: Update to 0.5.3+debian-10+ + + * file.c: Fix segfault of loadGeneralFile() + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718612 + +2013-08-02 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-10 + +2013-08-02 Piotr P. Karwasz + + * scripts/w3mman/w3mman2html.cgi.in: + Correct underline processing and more UTF-8 support for w3mman2html.cgi. + Patch from + on 2010-11-23. + +2013-08-01 Hilko Bengen + + * entity.c: Ignore SOFT HYPHEN to prevent drawing hyphens everywhere. + Patch from + on 2011-03-01. + +2013-08-01 Tatsuya Kinoshita + + * doc-jp/README, doc/README: Update contact list in README + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696209 + +2013-07-30 Tatsuya Kinoshita + + * config.guess, config.sub: + Update config.guess and config.sub to supprot aarch64. + Updated with Debian autotools-dev version 20130515.1. + +2013-07-30 Conrad J.C. Hughes + + * main.c: Sort anchors by sequence number in -dump. + Patch from + on 2012-01-27. + +2013-07-30 Tatsuya Kinoshita + + * version.c.in: Update to 0.5.3+debian-9+ + +2013-07-29 Tatsuya Kinoshita + + * version.c.in: Update version to w3m/0.5.3+debian-9 + + * version.c.in: Set CURRENT_VERSION to debian version + +2013-07-28 Tatsuya Kinoshita + + * file.c: Fix segfault of process_button() + +2013-04-08 AIDA Shinra + + * file.c: One more patch for siteconf from [w3m-dev 04464] + + * anchor.c, config.h.in, display.c, doc-jp/README.siteconf: + * doc/README.siteconf, file.c, fm.h, form.c, frame.c, func.c: + * history.c, indep.c, indep.h, linein.c, main.c, map.c, menu.c: + * po/ja.po, proto.h, rc.c, url.c: Support the siteconf feature. + Patch to support the siteconf feature, from [w3m-dev 04463] + on 2012-06-27. + +2013-04-08 Hayaki Saito + + * keybind.c, main.c, proto.h, terms.c: + Support SGR 1006 mouse reporting. + cf. [w3m-dev 04466] on 2012-07-15 + Origin: https://gist.github.com/3114255 + Bug: https://sourceforge.net/p/w3m/patches/65/ + +2012-05-19 Hilko Bengen + + * form.c: Assume "text" if an input type is unknown. + Patch from on 2011-03-01. + +2012-05-19 Simon Ruderich + + * Makefile.in: Use $(CPPFLAGS) with $(CPP). + Patch from + on 2012-03-24. + +2012-05-03 Miroslav Šulc + + * w3mimg/Makefile.in: Fix parallel make issue. + Patch from Gentoo + + on 2011-02-01. + +2012-05-03 MATSUU Takuto + + * main.c: Support Boehm GC 7.2. + Patch from Gentoo + + on 2009-12-13. + +2012-05-02 Reinhard Tartler + + * istream.c, istream.h: + Fix that struct file_handle conflicts with glibc 2.14. + Patch from + on 2012-02-19. + +2011-10-30 Colin Watson + + * acinclude.m4, configure, w3mbookmark.c: + Appease gcc -Werror=format-security. + Patch from 0.5.3-3ubuntu1 on 2011-10-23. + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646321 + +2011-06-19 Martin Pitt + + * Makefile.in: + Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5. + Patch from 0.5.2-10ubuntu1 on 2010-12-03. + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605761 + +2011-06-19 Fumitoshi UKAI + + * main.c: Change the -s option to "squeeze multiple blank lines". + Change the -s option from "display charset Shift_JIS" to "squeeze + multiple blank lines" to work as /usr/bin/pager. In addition, the + options -j and -e are disabled. To specify the display charset, + use -O{s|j|e} instead. + Patch from [w3m-dev 01275] on 2000-10-26. + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=75527 + +2011-06-19 Hiroyuki Ito + + * file.c, fm.h, html.c, html.h, proto.h, table.c, tagtable.tab: + Support the button element as defined in HTML 4.01. + Patch from upstream, [w3m-dev 04411] on 2010-09-17, to support the + button element. It is discussed upstream and incomplete, but enough + to login Launchpad. + Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=136810 + Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/628755 + 2012-05-22 Tatsuya Kinoshita * [w3m-dev 04451] w3m/entity.h should be removed when `make clean' diff --git a/Makefile.in b/Makefile.in index 7d692f9..453072d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -111,6 +111,7 @@ IMGDISPLAY=w3mimgdisplay$(EXT) MAN1_TARGET=$(PACKAGE).1 MAN1=$(top_srcdir)/doc/w3m.1 MAN1_JA=$(top_srcdir)/doc-jp/w3m.1 +MAN1_DE=$(top_srcdir)/doc-de/w3m.1 LIB_TARGETS=$(BOOKMARKER) $(HELPER) AUXBIN_TARGETS=@AUXBIN_TARGETS@ @@ -150,7 +151,7 @@ parsetagx.o: html.c funcname.tab: $(DEFUNS) (echo '#define DEFUN(x,y,z) x y';\ - sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) - | \ + sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $(DEFUNS)) | $(CPP) $(CPPFLAGS) - | \ awk '$$1 ~ /^[_A-Za-z]/ { \ for (i=2;i<=NF;i++) { print $$i, $$1} \ }' > $@.tmp @@ -220,10 +221,12 @@ install-core: $(TARGETS) -$(MKDIR) $(DESTDIR)$(HELP_DIR) -$(MKDIR) $(DESTDIR)$(mandir)/man1 -$(MKDIR) $(DESTDIR)$(mandir)/ja/man1 + -$(MKDIR) $(DESTDIR)$(mandir)/de/man1 $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) $(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1/$(MAN1_TARGET) $(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(mandir)/ja/man1/$(MAN1_TARGET) + $(INSTALL_DATA) $(MAN1_DE) $(DESTDIR)$(mandir)/de/man1/$(MAN1_TARGET) targets="$(AUXBIN_TARGETS)"; for file in $$targets; \ do \ case $$file in \ @@ -250,7 +253,7 @@ install-po: (cd $$subdir && $(MAKE) install); \ done -all-scripts: +all-scripts: funcname.tab for dir in $(SCRIPTSUBDIRS); \ do \ (cd $$dir && $(MAKE) $(MAKE_ARGS)); \ @@ -280,6 +283,7 @@ uninstall: -$(RM) -f $(HELP_DIR)/$(HELP_TARGET) -$(RM) -f $(mandir)/man1/$(MAN1_TARGET) -$(RM) -f $(mandir)/ja/man1/$(MAN1_TARGET) + -$(RM) -f $(mandir)/de/man1/$(MAN1_TARGET) -for dir in $(SCRIPTSUBDIRS); \ do \ (cd $$dir && $(MAKE) $(MAKE_ARGS) uninstall); \ diff --git a/NEWS b/NEWS index 66e309d..6cc597f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,100 @@ +Debian's w3m 0.5.3+git20200502 + +* bug fixes + - support ' entity + - prevent multiple User-Agent with -header + - fix -Wchar-subscripts +* new features + - support setting user_agent in siteconf + - new command GOTO_HOME + - extend ssl_forbid_method for TLSv1.2 and TLSv1.3 + +Debian's w3m 0.5.3+git20190105 + +* bug fixes + - do not use deprecated features with OpenSSL 1.1 + - fix dependency for Imlib2 + - fix that the mark_all_pages option works + - respect the simple_preserve_space option for table cells + - fix error handling for ~/.w3m/request.log and localcgi_post() +* new feature + - w3mman supports specifying a section number during a keyword search + +Debian's w3m 0.5.3+git20180125 + +* bug fixes + - fix stack overflow with malformed text [CVE-2018-6196] + - fix null deref with malformed text [CVE-2018-6197] + - fix /tmp file races only when ~/.w3m is unwritable [CVE-2018-6198] + - do not remove w3mdict.cgi when "make distclean" + - do not turn a form's GET into POST + - correct parsing + - accept TERM=fbterm +* new feature + - extend ssl_forbid_method to disable TLSv1.1 + +Debian's w3m 0.5.3+git20170102 + +* bug fixes + - fix multiple flaws with malformed text + (buffer overflow, use after free, infinite loop) + - fix uninitialized variable when not USE_IMAGE + +Debian's w3m 0.5.3+git20161120 + +* bug fixes + - fix multiple flaws with malformed text + (stack overflow, buffer overflow, null deref, out of memory) + [CVE-2016-9622], [CVE-2016-9623], [CVE-2016-9624], [CVE-2016-9625], + [CVE-2016-9626], [CVE-2016-9627], [CVE-2016-9628], [CVE-2016-9629], + [CVE-2016-9630], [CVE-2016-9631], [CVE-2016-9632], [CVE-2016-9633] + - fix stack overflow with nested table and textarea [CVE-2016-9439] + - fix suspend (^Z) behavior + +Debian's w3m 0.5.3+git20161031 + +* new features + - support OSC 5379 remote imaging and sixel graphics + - support SGR style mouse handler + - support 32-bit color images + - support FreeBSD framebuffer + - support button element + - support meta charset + - include w3mdict.cgi to use a dictd dictionary query + - add extbrowser4..9 + - add display_borders to display 0 pixel table borders + - add siteconf feature + - add German translation for options setting panel + - add translations for de, zh_CN and zh_TW +* bug fixes + - fix multiple flaws with malformed text + [CVE-2016-9422], [CVE-2016-9423], [CVE-2016-9424], [CVE-2016-9425], + [CVE-2016-9426], [CVE-2016-9428], [CVE-2016-9429], [CVE-2016-9430], + [CVE-2016-9431], [CVE-2016-9432], [CVE-2016-9433], [CVE-2016-9434], + [CVE-2016-9435], [CVE-2016-9436], [CVE-2016-9437], [CVE-2016-9438], + [CVE-2016-9440], [CVE-2016-9441], [CVE-2016-9443], [CVE-2016-9621] + - fix potential heap buffer corruption due to Strgrow [CVE-2016-9442] + - disable SSLv2 and SSLv3 by default [CVE-2014-3566] + - set ssl_verify_server to 1 by default + - disable RC4, export ciphers, and keys < 128 bits + - use SSL_OP_NO_COMPRESSION due to "CRIME attack" [CVE-2012-4929] + - use SSL_MODE_RELEASE_BUFFERS + - disable USE_EGD for LibreSSL + - appease gcc -Werror=format-security + - option -s is now "squeeze multiple blank lines" to work as pager, and + -j and -e are obsolete, so use -O{s|j|e} to specify display charset + - accept single quoted meta refresh URL + - assume "text" if a form input type is unknown + - accept cookies by default + - set use_dictcommand to 1 by default + - set default_url to 1 by default + - set argv_is_url to 1 by default + - set alt_entity to 0 by default + - fix build problems with Boehm GC 7.2, imlib2 1.4.6 and glibc 2.14 + - fix parallel make failure + - fix incorrect ucs_ambwidth_map + - and many fixes + w3m 0.5.3 - 2011-01-15 * security fix diff --git a/README b/README index 8778d80..765c996 100644 --- a/README +++ b/README @@ -1,3 +1,9 @@ +w3m: WWW wo Miru Tool +===================== + +w3m is a pager with WWW capability. It IS a pager, but it can be used +as a text-mode WWW browser. + If you can read English, see doc/*. If you can read Japanese, see doc-jp/*. If you can read both, read both and correct English. :-) diff --git a/Str.c b/Str.c index e5a0982..61fe3ca 100644 --- a/Str.c +++ b/Str.c @@ -48,6 +48,8 @@ Str Strnew_size(int n) { Str x = GC_MALLOC(sizeof(struct _Str)); + if (n < 0) + n = 0; x->ptr = GC_MALLOC_ATOMIC(n + 1); x->ptr[0] = '\0'; x->area_size = n + 1; @@ -56,7 +58,7 @@ Strnew_size(int n) } Str -Strnew_charp(char *p) +Strnew_charp(const char *p) { Str x; int n; @@ -73,7 +75,7 @@ Strnew_charp(char *p) } Str -Strnew_m_charp(char *p, ...) +Strnew_m_charp(const char *p, ...) { va_list ap; Str r = Strnew(); @@ -87,7 +89,7 @@ Strnew_m_charp(char *p, ...) } Str -Strnew_charp_n(char *p, int n) +Strnew_charp_n(const char *p, int n) { Str x; @@ -140,7 +142,7 @@ Strcopy(Str x, Str y) } void -Strcopy_charp(Str x, char *y) +Strcopy_charp(Str x, const char *y) { int len; @@ -160,7 +162,7 @@ Strcopy_charp(Str x, char *y) } void -Strcopy_charp_n(Str x, char *y, int n) +Strcopy_charp_n(Str x, const char *y, int n) { int len = n; @@ -180,7 +182,7 @@ Strcopy_charp_n(Str x, char *y, int n) } void -Strcat_charp_n(Str x, char *y, int n) +Strcat_charp_n(Str x, const char *y, int n) { int newlen; @@ -209,7 +211,7 @@ Strcat(Str x, Str y) } void -Strcat_charp(Str x, char *y) +Strcat_charp(Str x, const char *y) { if (y == NULL) return; @@ -232,8 +234,8 @@ Strgrow(Str x) { char *old = x->ptr; int newlen; - newlen = x->length * 6 / 5; - if (newlen == x->length) + newlen = x->area_size * 6 / 5; + if (newlen == x->area_size) newlen += 2; x->ptr = GC_MALLOC_ATOMIC(newlen); x->area_size = newlen; @@ -278,8 +280,8 @@ void Strchop(Str s) { STR_LENGTH_CHECK(s); - while ((s->ptr[s->length - 1] == '\n' || s->ptr[s->length - 1] == '\r') && - s->length > 0) { + while (s->length > 0 && + (s->ptr[s->length - 1] == '\n' || s->ptr[s->length - 1] == '\r')) { s->length--; } s->ptr[s->length] = '\0'; @@ -301,7 +303,7 @@ Strinsert_char(Str s, int pos, char c) } void -Strinsert_charp(Str s, int pos, char *p) +Strinsert_charp(Str s, int pos, const char *p) { STR_LENGTH_CHECK(s); while (*p) @@ -530,11 +532,8 @@ Str Strfgets(FILE * f) { Str s = Strnew(); - char c; - while (1) { - c = fgetc(f); - if (feof(f) || ferror(f)) - break; + int c; + while ((c = fgetc(f)) != EOF) { Strcat_char(s, c); if (c == '\n') break; @@ -546,11 +545,8 @@ Str Strfgetall(FILE * f) { Str s = Strnew(); - char c; - while (1) { - c = fgetc(f); - if (feof(f) || ferror(f)) - break; + int c; + while ((c = fgetc(f)) != EOF) { Strcat_char(s, c); } return s; diff --git a/Str.h b/Str.h index f345c74..248815d 100644 --- a/Str.h +++ b/Str.h @@ -30,22 +30,22 @@ typedef struct _Str { Str Strnew(void); Str Strnew_size(int); -Str Strnew_charp(char *); -Str Strnew_charp_n(char *, int); -Str Strnew_m_charp(char *, ...); +Str Strnew_charp(const char *); +Str Strnew_charp_n(const char *, int); +Str Strnew_m_charp(const char *, ...); Str Strdup(Str); void Strclear(Str); void Strfree(Str); void Strcopy(Str, Str); -void Strcopy_charp(Str, char *); -void Strcopy_charp_n(Str, char *, int); -void Strcat_charp_n(Str, char *, int); +void Strcopy_charp(Str, const char *); +void Strcopy_charp_n(Str, const char *, int); +void Strcat_charp_n(Str, const char *, int); void Strcat(Str, Str); -void Strcat_charp(Str, char *); +void Strcat_charp(Str, const char *); void Strcat_m_charp(Str, ...); Str Strsubstr(Str, int, int); void Strinsert_char(Str, int, char); -void Strinsert_charp(Str, int, char *); +void Strinsert_charp(Str, int, const char *); void Strdelete(Str, int, int); void Strtruncate(Str, int); void Strlower(Str); diff --git a/acinclude.m4 b/acinclude.m4 index e4ccc3d..ed1035d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -6,7 +6,8 @@ dnl w3m autoconf macros AC_DEFUN([AC_W3M_VERSION], [AC_SUBST(CURRENT_VERSION) cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' $srcdir/ChangeLog` - sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c + ymdver=`sed -e 's/ .*//;s/-//g;q' $srcdir/ChangeLog` + sed -e 's/define CURRENT_VERSION "\(.*\)YYYYMMDD/define CURRENT_VERSION "\1'$ymdver'/;s/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`]) # # ---------------------------------------------------------------- @@ -330,10 +331,10 @@ AC_DEFINE_UNQUOTED(DEF_MAILER, "$w3m_mailer")]) # ---------------------------------------------------------------- AC_DEFUN([AC_W3M_EXT_BROWSER], [AC_SUBST(DEF_EXT_BROWSER) -w3m_browser="/usr/bin/mozilla" +w3m_browser="/usr/bin/firefox" AC_MSG_CHECKING(which external browser is used by default) AC_ARG_WITH(browser, - [ --with-browser=BROWSER default browser (/usr/bin/mozilla)], + [ --with-browser=BROWSER default browser (/usr/bin/firefox)], [w3m_browser="$with_browser"]) AC_MSG_RESULT($w3m_browser) AC_DEFINE_UNQUOTED(DEF_EXT_BROWSER, "$w3m_browser")]) @@ -400,10 +401,10 @@ AC_DEFUN([AC_W3M_TERMLIB], AC_ARG_WITH(termlib, [ --with-termlib[=LIBS] terminal library LIBS is space separated list of: - terminfo mytinfo termcap ncurses curses],, + terminfo mytinfo termcap tinfo ncurses curses],, [with_termlib="yes"]) AC_MSG_RESULT($with_termlib) - test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" + test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap tinfo ncurses curses" for lib in $with_termlib; do AC_CHECK_LIB($lib, tgetent, [W3M_LIBS="$W3M_LIBS -l$lib"; break]) done @@ -600,7 +601,7 @@ AC_DEFUN([AC_W3M_IMAGE], if test x"$enable_image" = xyes; then enable_image=x11 case "`uname -s`" in - Linux|linux|LINUX) + Linux|linux|LINUX|FreeBSD|freebsd|FREEBSD) if test -c /dev/fb0; then enable_image=x11,fb fi;; @@ -649,6 +650,9 @@ AC_DEFUN([AC_W3M_IMAGE], fi;; imlib2) with_imlib2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config + fi if test x"$IMLIB2_CONFIG" = x; then IMLIB2_CONFIG=imlib2-config fi;; @@ -661,8 +665,6 @@ AC_DEFUN([AC_W3M_IMAGE], with_gtk2="yes" if test x"$PKG_CONFIG" = x; then PKG_CONFIG=pkg-config - else - PKG_CONFIG=: fi;; esac done @@ -705,8 +707,8 @@ AC_DEFUN([AC_W3M_IMAGE], IMGTARGETS="x11" AC_DEFINE(USE_GDKPIXBUF) AC_DEFINE(USE_GTK2) - IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" - IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" + IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`" elif test x"$have_gdkpixbuf" = xyes; then AC_DEFINE(USE_W3MIMG_X11) IMGOBJS="$IMGOBJS x11/x11_w3mimg.o" @@ -728,7 +730,7 @@ AC_DEFUN([AC_W3M_IMAGE], IMGTARGETS="x11" AC_DEFINE(USE_IMLIB2) IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) fi @@ -740,8 +742,8 @@ AC_DEFUN([AC_W3M_IMAGE], IMGTARGETS="${IMGTARGETS} fb" AC_DEFINE(USE_GDKPIXBUF) AC_DEFINE(USE_GTK2) - IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`" - IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`" + IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`" elif test x"$have_gdkpixbuf" = xyes; then AC_DEFINE(USE_W3MIMG_FB) IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" @@ -756,7 +758,7 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(USE_IMLIB2) IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) fi @@ -866,7 +868,7 @@ AC_MSG_CHECKING(for sys_errlist) AC_TRY_COMPILE( changequote(<<,>>)dnl <>, -<>, +<>, changequote([,])dnl [have_sys_errlist="yes"; AC_DEFINE(HAVE_SYS_ERRLIST)], [have_sys_errlist="no"]) diff --git a/alloc.h b/alloc.h new file mode 100644 index 0000000..fa0d391 --- /dev/null +++ b/alloc.h @@ -0,0 +1,39 @@ +/* + * by Scarlett. public domain. + * replacements for w3m's allocation macros which add overflow + * detection and concentrate the macros in one file + */ +#ifndef W3_ALLOC_H +#define W3_ALLOC_H +#include +#include +#include +#include + +static inline size_t +z_mult_no_oflow_(size_t n, size_t size) +{ + if (size != 0 && n > ULONG_MAX / size) { + fprintf(stderr, + "w3m: overflow in malloc, %lu*%lu\n", (unsigned long)n, (unsigned long)size); + exit(1); + } + return n * size; +} + +#define New(type) \ + (GC_MALLOC(sizeof(type))) + +#define NewAtom(type) \ + (GC_MALLOC_ATOMIC(sizeof(type))) + +#define New_N(type, n) \ + (GC_MALLOC(z_mult_no_oflow_((n), sizeof(type)))) + +#define NewAtom_N(type, n) \ + (GC_MALLOC_ATOMIC(z_mult_no_oflow_((n), sizeof(type)))) + +#define New_Reuse(type, ptr, n) \ + (GC_REALLOC((ptr), z_mult_no_oflow_((n), sizeof(type)))) + +#endif /* W3_ALLOC_H */ diff --git a/anchor.c b/anchor.c index 27bbd56..b6d121c 100644 --- a/anchor.c +++ b/anchor.c @@ -11,7 +11,7 @@ putAnchor(AnchorList *al, char *url, char *target, Anchor **anchor_return, { int n, i, j; Anchor *a; - BufferPoint bp; + BufferPoint bp = { 0 }; if (al == NULL) { al = New(AnchorList); al->anchors = NULL; @@ -200,10 +200,11 @@ _put_anchor_news(Buffer *buf, char *p1, char *p2, int line, int pos) if (*(p2 - 1) == '>') p2--; } - tmp = wc_Str_conv_strict(Strnew_charp_n(p1, p2 - p1), InnerCharset, - buf->document_charset); - tmp = Sprintf("news:%s", file_quote(tmp->ptr)); - return registerHref(buf, tmp->ptr, NULL, NO_REFERER, NULL, '\0', line, + tmp = Strnew_charp("news:"); + Strcat_charp_n(tmp, p1, p2 - p1); + return registerHref(buf, url_encode(tmp->ptr, baseURL(buf), + buf->document_charset), + NULL, NO_REFERER, NULL, '\0', line, pos); } #endif /* USE_NNTP */ @@ -213,9 +214,10 @@ _put_anchor_all(Buffer *buf, char *p1, char *p2, int line, int pos) { Str tmp; - tmp = wc_Str_conv_strict(Strnew_charp_n(p1, p2 - p1), InnerCharset, - buf->document_charset); - return registerHref(buf, url_quote(tmp->ptr), NULL, NO_REFERER, NULL, + tmp = Strnew_charp_n(p1, p2 - p1); + return registerHref(buf, url_encode(tmp->ptr, baseURL(buf), + buf->document_charset), + NULL, NO_REFERER, NULL, '\0', line, pos); } @@ -549,7 +551,8 @@ shiftAnchorPosition(AnchorList *al, HmarkerList *hl, int line, int pos, break; if (a->start.pos > pos) { a->start.pos += shift; - if (hl->marks[a->hseq].line == line) + if (hl && hl->marks && + a->hseq >= 0 && hl->marks[a->hseq].line == line) hl->marks[a->hseq].pos = a->start.pos; } if (a->end.pos >= pos) @@ -641,7 +644,6 @@ addMultirowsForm(Buffer *buf, AnchorList *al) { int i, j, k, col, ecol, pos; Anchor a_form, *a; - FormItemList *fi; Line *l, *ls; if (al == NULL || al->nanchor == 0) @@ -668,7 +670,6 @@ addMultirowsForm(Buffer *buf, AnchorList *al) if (!ls) continue; } - fi = (FormItemList *)a_form.url; col = COLPOS(ls, a_form.start.pos); ecol = COLPOS(ls, a_form.end.pos); for (j = 0; l && j < a_form.rows; l = l->next, j++) { @@ -685,6 +686,8 @@ addMultirowsForm(Buffer *buf, AnchorList *al) a->hseq = a_form.hseq; a->y = a_form.y; a->end.pos = pos + ecol - col; + if (pos < 1 || a->end.pos >= l->size) + continue; l->lineBuf[pos - 1] = '['; l->lineBuf[a->end.pos] = ']'; for (k = pos; k < a->end.pos; k++) @@ -756,7 +759,7 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, buf->document_charset)); + p = html_quote(url_decode2(p, buf)); else p = u; } @@ -787,7 +790,7 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, buf->document_charset)); + p = html_quote(url_decode2(p, buf)); else p = u; t = getAnchorText(buf, al, a); @@ -809,16 +812,13 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, buf->document_charset)); + p = html_quote(url_decode2(p, buf)); else p = u; if (a->title && *a->title) t = html_quote(a->title); - else if (DecodeURL) - t = html_quote(url_unquote_conv - (a->url, buf->document_charset)); else - t = html_quote(a->url); + t = html_quote(url_decode2(a->url, buf)); Strcat_m_charp(tmp, "
  • ", t, "
    ", p, "\n", NULL); a = retrieveAnchor(buf->formitem, a->start.line, a->start.pos); @@ -842,19 +842,13 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, - buf-> - document_charset)); + p = html_quote(url_decode2(p, buf)); else p = u; if (m->alt && *m->alt) t = html_quote(m->alt); - else if (DecodeURL) - t = html_quote(url_unquote_conv(m->url, - buf-> - document_charset)); else - t = html_quote(m->url); + t = html_quote(url_decode2(m->url, buf)); Strcat_m_charp(tmp, "
  • ", t, "
    ", p, "\n", NULL); } diff --git a/buffer.c b/buffer.c index 5afc26a..e70cffe 100644 --- a/buffer.c +++ b/buffer.c @@ -47,6 +47,8 @@ newBuffer(int width) #ifdef USE_M17N n->auto_detect = WcOption.auto_detect; #endif + n->check_url = MarkAllPages; /* use default from -o mark_all_pages */ + n->need_reshape = 1; /* always reshape new buffers to mark URLs */ return n; } @@ -705,6 +707,7 @@ readBufferCache(Buffer *buf) cache = fopen(buf->savecache, "r"); if (cache == NULL || fread1(clnum, cache) || fread1(tlnum, cache)) { + fclose(cache); buf->savecache = NULL; return -1; } @@ -760,8 +763,10 @@ readBufferCache(Buffer *buf) } #endif } - buf->lastLine = prevl; - buf->lastLine->next = NULL; + if (prevl) { + buf->lastLine = prevl; + buf->lastLine->next = NULL; + } fclose(cache); unlink(buf->savecache); buf->savecache = NULL; diff --git a/config.guess b/config.guess index 51fab47..f50dcdb 100755 --- a/config.guess +++ b/config.guess @@ -1,13 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2004-03-12' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,24 +15,22 @@ timestamp='2004-03-12' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` @@ -42,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -53,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +62,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,16 +100,16 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -123,7 +119,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -136,12 +132,40 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "$UNAME_SYSTEM" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi + ;; +esac + # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -151,22 +175,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ + echo unknown)` + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown + ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -176,7 +211,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd + ;; + esac + # Determine ABI tags. + case "$UNAME_MACHINE_ARCH" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -184,83 +226,62 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pegasos:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + echo "$machine-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" + exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" + exit ;; + *:SolidBSD:*:*) + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" + exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" + exit ;; + *:Sortix:*:*) + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,76 +291,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-amigaos + exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-morphos + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + echo arm-acorn-riscix"$UNAME_RELEASE" + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -347,32 +365,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux"$UNAME_RELEASE" + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval "$set_cc_for_build" + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -380,26 +417,26 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + echo m68k-sun-sunos"$UNAME_RELEASE" + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + echo sparc-auspex-sunos"$UNAME_RELEASE" + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -409,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint"$UNAME_RELEASE" + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint"$UNAME_RELEASE" + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint"$UNAME_RELEASE" + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint"$UNAME_RELEASE" + exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + echo m68k-apple-machten"$UNAME_RELEASE" + exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-machten"$UNAME_RELEASE" + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + echo mips-dec-ultrix"$UNAME_RELEASE" + exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + echo vax-dec-ultrix"$UNAME_RELEASE" + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + echo clipper-intergraph-clix"$UNAME_RELEASE" + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -455,94 +492,95 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos"$UNAME_RELEASE" + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -553,128 +591,143 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + exit ;; + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "$sc_cpu_version" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "$sc_kernel_bits" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval "$set_cc_for_build" + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" + exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" + exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -699,360 +752,364 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" + exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + echo sparc-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case "$UNAME_PROCESSOR" in + amd64) + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; + esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; + *:MINGW64*:*) + echo "$UNAME_MACHINE"-pc-mingw64 + exit ;; + *:MINGW*:*) + echo "$UNAME_MACHINE"-pc-mingw32 + exit ;; + *:MSYS*:*) + echo "$UNAME_MACHINE"-pc-msys + exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit 0 ;; + echo "$UNAME_MACHINE"-pc-pw32 + exit ;; + *:Interix*:*) + case "$UNAME_MACHINE" in + x86) + echo i586-pc-interix"$UNAME_RELEASE" + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix"$UNAME_RELEASE" + exit ;; + IA64) + echo ia64-unknown-interix"$UNAME_RELEASE" + exit ;; + esac ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; + echo "$UNAME_MACHINE"-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + echo "$UNAME_MACHINE"-pc-minix + exit ;; + aarch64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + eval "$set_cc_for_build" + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + else + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; + crisv32:Linux:*:*) + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; + e2k:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + frv:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + hexagon:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + i*86:Linux:*:*) + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + k1om:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-"$LIBC" + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-"$LIBC" + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-"$LIBC" + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-"$LIBC" + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-"$LIBC" + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + tile*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + vax:Linux:*:*) + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi + exit ;; + xtensa*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + # Use sysv4.2uw... so that sysv4* matches it. + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + echo "$UNAME_MACHINE"-pc-os2-emx + exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-stop + exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo "$UNAME_MACHINE"-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos"$UNAME_RELEASE" + exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + echo "$UNAME_MACHINE"-pc-msdosdjgpp + exit ;; + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1062,369 +1119,333 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi - exit 0 ;; + exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-lynxos"$UNAME_RELEASE" + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo sparc-unknown-lynxos"$UNAME_RELEASE" + exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + echo rs6000-unknown-lynxos"$UNAME_RELEASE" + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos"$UNAME_RELEASE" + exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + echo mips-dde-sysv"$UNAME_RELEASE" + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo "$UNAME_MACHINE"-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + echo m68k-apple-aux"$UNAME_RELEASE" + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + echo sx4-nec-superux"$UNAME_RELEASE" + exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + echo sx5-nec-superux"$UNAME_RELEASE" + exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + echo sx6-nec-superux"$UNAME_RELEASE" + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux"$UNAME_RELEASE" + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux"$UNAME_RELEASE" + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux"$UNAME_RELEASE" + exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval "$set_cc_for_build" + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-plan9 + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + echo mips-sei-seiux"$UNAME_RELEASE" + exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "$UNAME_MACHINE" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + exit ;; + i*86:rdos:*:*) + echo "$UNAME_MACHINE"-pc-rdos + exit ;; + i*86:AROS:*:*) + echo "$UNAME_MACHINE"-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo "$UNAME_MACHINE"-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +echo "$0: unable to guess system type" >&2 -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 </dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize +the system type. Please install a C compiler and try again. EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi + ;; +esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1443,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/config.h.dist b/config.h.dist index 844a555..4d9c119 100644 --- a/config.h.dist +++ b/config.h.dist @@ -9,10 +9,10 @@ /* User Configuration */ /* - If you define DICT, you can use dictionary look-up function + If you define USE_DICT, you can use dictionary look-up function in w3m. See README.dict for detail. */ -#define DICT +#define USE_DICT /* If you want to load and save URL history. @@ -210,6 +210,7 @@ typedef long clen_t; #define HAVE_SRANDOM #undef HAVE_GETPASSPHRASE #define HAVE_CHDIR +#define HAVE_MKDTEMP #define SETJMP(env) sigsetjmp(env,1) diff --git a/config.h.in b/config.h.in index 2f41eed..6ab3008 100644 --- a/config.h.in +++ b/config.h.in @@ -25,6 +25,7 @@ #define PASSWD_FILE RC_DIR "/passwd" #define PRE_FORM_FILE RC_DIR "/pre_form" +#define SITECONF_FILE RC_DIR "/siteconf" #define USER_MAILCAP RC_DIR "/mailcap" #define SYS_MAILCAP CONF_DIR "/mailcap" #define USER_MIMETYPES "~/.mime.types" @@ -84,7 +85,7 @@ #undef INET6 #undef HAVE_SOCKLEN_T #undef HAVE_OLD_SS_FAMILY -#define USE_EGD +#undef USE_EGD #define ENABLE_REMOVE_TRAILINGSPACES #undef MENU_THIN_FRAME #undef USE_RAW_SCROLL @@ -142,6 +143,7 @@ typedef long clen_t; #undef HAVE_SRANDOM #undef HAVE_GETPASSPHRASE #undef HAVE_CHDIR +#undef HAVE_MKDTEMP #undef HAVE_SETPGRP #undef HAVE_SETLOCALE #undef HAVE_LANGINFO_CODESET @@ -209,6 +211,10 @@ typedef RETSIGTYPE MySignalHandler; #define SUPPORT_WIN9X_CONSOLE_MBCS 1 #endif +#if defined(__CYGWIN__) && defined(__x86_64__) +#define DONT_CALL_GC_AFTER_FORK +#endif + #if defined(__DJGPP__) #define DEFAULT_TERM "dosansi" #else diff --git a/config.sub b/config.sub index ba33103..1d8e98b 100755 --- a/config.sub +++ b/config.sub @@ -1,42 +1,40 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2004-03-12' +timestamp='2018-02-22' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# along with this program; if not, see . +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -55,12 +53,11 @@ timestamp='2004-03-12' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -70,8 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +79,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,8 +94,8 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 - exit 0;; + echo "$1" + exit ;; * ) break ;; @@ -116,17 +112,24 @@ esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -145,10 +148,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -163,54 +169,65 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 ;; -lynx*) os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -227,56 +244,114 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown ;; # We use `pc' rather than `unknown' @@ -287,70 +362,102 @@ case $basic_machine in ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ - | v850-* | v850e-* | vax-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -363,7 +470,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -384,7 +491,7 @@ case $basic_machine in basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -409,6 +516,13 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -417,10 +531,35 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -445,13 +584,20 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; - cr16c) - basic_machine=cr16c-unknown + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; @@ -481,14 +627,30 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -578,9 +740,6 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -592,28 +751,27 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -631,8 +789,16 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; - m88k-omron*) - basic_machine=m88k-omron + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; magnum | m3230) basic_machine=mips-mips @@ -642,10 +808,21 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -654,14 +831,10 @@ case $basic_machine in os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -671,14 +844,29 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -707,7 +895,7 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -743,20 +931,27 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -778,6 +973,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -787,6 +990,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -800,41 +1009,42 @@ case $basic_machine in basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -843,6 +1053,14 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -869,6 +1087,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -876,14 +1098,10 @@ case $basic_machine in sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown + sh5el) + basic_machine=sh5le-unknown ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -901,6 +1119,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -957,17 +1178,9 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -1029,17 +1242,23 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1059,31 +1278,24 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1103,7 +1315,7 @@ case $basic_machine in # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1111,10 +1323,10 @@ esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1125,49 +1337,60 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1184,12 +1407,12 @@ case $os in -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1198,26 +1421,20 @@ case $os in os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1242,7 +1459,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1255,7 +1472,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1264,7 +1481,7 @@ case $os in -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1279,27 +1496,38 @@ case $os in -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos ;; - -kaos*) - os=-kaos + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; + -nacl*) + ;; + -ios) ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1316,6 +1544,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1325,9 +1559,24 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1346,13 +1595,13 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1368,12 +1617,18 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1407,7 +1662,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1422,9 +1677,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1476,7 +1728,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1534,15 +1786,15 @@ case $basic_machine in vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os -exit 0 +echo "$basic_machine$os" +exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index 4c1bc06..8699b43 100755 --- a/configure +++ b/configure @@ -1486,11 +1486,11 @@ Optional Packages: --with-migemo=MIGEMO_COMMAND migemo command --with-editor=EDITOR default editor (/usr/bin/vi) --with-mailer=MAILER default mailer (/usr/bin/mail) - --with-browser=BROWSER default browser (/usr/bin/mozilla) + --with-browser=BROWSER default browser (/usr/bin/firefox) --with-ssl=PREFIX support https protocol --with-termlib=LIBS terminal library LIBS is space separated list of: - terminfo mytinfo termcap ncurses curses + terminfo mytinfo termcap tinfo ncurses curses --with-gc=PREFIX libgc PREFIX Some influential environment variables: @@ -6755,7 +6755,7 @@ $as_echo "$enable_image" >&6; } if test x"$enable_image" = xyes; then enable_image=x11 case "`uname -s`" in - Linux|linux|LINUX) + Linux|linux|LINUX|FreeBSD|freebsd|FREEBSD) if test -c /dev/fb0; then enable_image=x11,fb fi;; @@ -6811,6 +6811,9 @@ $as_echo "$with_imagelib" >&6; } fi;; imlib2) with_imlib2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config + fi if test x"$IMLIB2_CONFIG" = x; then IMLIB2_CONFIG=imlib2-config fi;; @@ -6823,8 +6826,6 @@ $as_echo "$with_imagelib" >&6; } with_gtk2="yes" if test x"$PKG_CONFIG" = x; then PKG_CONFIG=pkg-config - else - PKG_CONFIG=: fi;; esac done @@ -6926,8 +6927,8 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= $as_echo "#define USE_GTK2 1" >>confdefs.h - IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" - IMGX11LDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0 gtk+-2.0`" + IMGX11CFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0`" elif test x"$have_gdkpixbuf" = xyes; then $as_echo "#define USE_W3MIMG_X11 1" >>confdefs.h @@ -6955,7 +6956,7 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= $as_echo "#define USE_IMLIB2 1" >>confdefs.h IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5 $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} @@ -6971,8 +6972,8 @@ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} $as_echo "#define USE_GTK2 1" >>confdefs.h - IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0 gtk+-2.0`" - IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0 gtk+-2.0`" + IMGFBCFLAGS="`${PKG_CONFIG} --cflags gdk-pixbuf-2.0`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs gdk-pixbuf-2.0`" elif test x"$have_gdkpixbuf" = xyes; then $as_echo "#define USE_W3MIMG_FB 1" >>confdefs.h @@ -6991,7 +6992,7 @@ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5 $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} @@ -7344,7 +7345,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -w3m_browser="/usr/bin/mozilla" +w3m_browser="/usr/bin/firefox" { $as_echo "$as_me:${as_lineno-$LINENO}: checking which external browser is used by default" >&5 $as_echo_n "checking which external browser is used by default... " >&6; } @@ -7977,7 +7978,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_termlib" >&5 $as_echo "$with_termlib" >&6; } - test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap ncurses curses" + test x"$with_termlib" = xyes && with_termlib="terminfo mytinfo termlib termcap tinfo ncurses curses" for lib in $with_termlib; do as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5 @@ -8766,7 +8767,7 @@ _ACEOF -for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale +for ac_func in strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir mkdtemp getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -8986,7 +8987,7 @@ extern char *sys_errlist[]; int main () { -printf(sys_errlist[0]); +printf("%s", sys_errlist[0]); ; return 0; } @@ -9076,7 +9077,7 @@ RC_DIR="~/.$PACKAGE" $as_echo "#define RC_DIR \"\$RC_DIR\"" >>confdefs.h -DOCDIRS="doc:en_English doc-jp:ja_Japanese" +DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German" cat >>confdefs.h <<_ACEOF #define DOCDIRS "$DOCDIRS" _ACEOF @@ -9084,9 +9085,10 @@ _ACEOF cvsver=`$AWK '\$1 ~ /Id:/ { print \$3}' $srcdir/ChangeLog` - sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c + ymdver=`sed -e 's/ .*//;s/-//g;q' $srcdir/ChangeLog` + sed -e 's/define CURRENT_VERSION "\(.*\)YYYYMMDD/define CURRENT_VERSION "\1'$ymdver'/;s/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c` -ac_config_files="$ac_config_files Makefile posubst po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" +ac_config_files="$ac_config_files Makefile posubst po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman.de.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -9810,6 +9812,7 @@ do "scripts/w3mman/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/w3mman/Makefile" ;; "scripts/w3mman/w3mman") CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman" ;; "scripts/w3mman/w3mman.1") CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman.1" ;; + "scripts/w3mman/w3mman.de.1") CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman.de.1" ;; "scripts/w3mman/w3mman2html.cgi") CONFIG_FILES="$CONFIG_FILES scripts/w3mman/w3mman2html.cgi" ;; "libwc/Makefile") CONFIG_FILES="$CONFIG_FILES libwc/Makefile" ;; "w3mimg/Makefile") CONFIG_FILES="$CONFIG_FILES w3mimg/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7308fc6..ebb3282 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ dnl AC_FUNC_MEMCMP dnl AC_FUNC_MMAP dnl AC_FUNC_SETVBUF_REVERSED dnl AC_FUNC_VPRINTF -AC_CHECK_FUNCS(strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale) +AC_CHECK_FUNCS(strcasecmp strcasestr strchr memcpy strerror bcopy setpgrp chdir mkdtemp getcwd getwd readlink setenv putenv strtoll stroq atoll atoq symlink readlink lstat srand48 srandom getpassphrase waitpid setlocale) AC_FUNC_STRFTIME AC_FUNC_WAIT3 AC_FUNC_SETPGRP @@ -172,7 +172,7 @@ AC_SUBST(RC_DIR) RC_DIR="~/.$PACKAGE" AC_DEFINE(RC_DIR, "$RC_DIR") AC_SUBST(DOCDIRS) -DOCDIRS="doc:en_English doc-jp:ja_Japanese" +DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German" AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS") AC_W3M_VERSION @@ -181,7 +181,8 @@ scripts/Makefile scripts/dirlist.cgi \ scripts/w3mhelp.cgi \ scripts/w3mmail.cgi scripts/xface2xpm \ scripts/multipart/Makefile scripts/multipart/multipart.cgi \ -scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 \ +scripts/w3mman/Makefile scripts/w3mman/w3mman \ +scripts/w3mman/w3mman.1 scripts/w3mman/w3mman.de.1 \ scripts/w3mman/w3mman2html.cgi \ libwc/Makefile \ w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile \ diff --git a/cookie.c b/cookie.c index 8020f6d..705e277 100644 --- a/cookie.c +++ b/cookie.c @@ -22,10 +22,10 @@ static int is_saved = 1; #define contain_no_dots(p, ep) (total_dot_number((p),(ep),1)==0) -static int -total_dot_number(char *p, char *ep, int max_count) +static unsigned int +total_dot_number(char *p, char *ep, unsigned int max_count) { - int count = 0; + unsigned int count = 0; if (!ep) ep = p + strlen(p); @@ -105,6 +105,7 @@ make_portlist(Str port) pl->next = first; first = pl; } + Strfree(tmp); return first; } @@ -247,16 +248,12 @@ find_cookie(ParsedURL *pu) Strcat(tmp, Sprintf("; $Domain=\"%s\"", p1->domain->ptr)); if (p1->portl) Strcat(tmp, - Sprintf("; $Port=\"%s\"", portlist2str(p1->portl))); + Sprintf("; $Port=\"%s\"", portlist2str(p1->portl)->ptr)); } } return tmp; } -char *special_domain[] = { - ".com", ".edu", ".gov", ".mil", ".net", ".org", ".int", NULL -}; - int check_avoid_wrong_number_of_dots_domain( Str domain ) { @@ -324,7 +321,7 @@ add_cookie(ParsedURL *pu, Str name, Str value, if (version == 0) { /* [NETSCAPE] rule */ - int n = total_dot_number(domain->ptr, + unsigned int n = total_dot_number(domain->ptr, domain->ptr + domain->length, 3); if (n < 2) { @@ -332,19 +329,6 @@ add_cookie(ParsedURL *pu, Str name, Str value, COOKIE_ERROR(COO_ESPECIAL); } } - else if (n == 2) { - char **sdomain; - int ok = 0; - for (sdomain = special_domain; !ok && *sdomain; sdomain++) { - int offset = domain->length - strlen(*sdomain); - if (offset >= 0 && - strcasecmp(*sdomain, &domain->ptr[offset]) == 0) - ok = 1; - } - if (!ok && ! check_avoid_wrong_number_of_dots_domain(domain)) { - COOKIE_ERROR(COO_ESPECIAL); - } - } } else { /* [DRAFT 12] s. 4.3.2 case 2 */ @@ -463,7 +447,7 @@ save_cookies(void) continue; fprintf(fp, "%s\t%s\t%s\t%ld\t%s\t%s\t%d\t%d\t%s\t%s\t%s\n", parsedURL2Str(&p->url)->ptr, - p->name->ptr, p->value->ptr, p->expires, + p->name->ptr, p->value->ptr, (long)p->expires, p->domain->ptr, p->path->ptr, p->flag, p->version, str2charp(p->comment), (p->portl) ? portlist2str(p->portl)->ptr : "", @@ -517,36 +501,36 @@ load_cookies(void) cookie->commentURL = NULL; parseURL(readcol(&str)->ptr, &cookie->url, NULL); if (!*str) - return; + break; cookie->name = readcol(&str); if (!*str) - return; + break; cookie->value = readcol(&str); if (!*str) - return; + break; cookie->expires = (time_t) atol(readcol(&str)->ptr); if (!*str) - return; + break; cookie->domain = readcol(&str); if (!*str) - return; + break; cookie->path = readcol(&str); if (!*str) - return; + break; cookie->flag = atoi(readcol(&str)->ptr); if (!*str) - return; + break; cookie->version = atoi(readcol(&str)->ptr); if (!*str) - return; + break; cookie->comment = readcol(&str); if (cookie->comment->length == 0) cookie->comment = NULL; if (!*str) - return; + break; cookie->portl = make_portlist(readcol(&str)); if (!*str) - return; + break; cookie->commentURL = readcol(&str); if (cookie->commentURL->length == 0) cookie->commentURL = NULL; diff --git a/display.c b/display.c index e00eb0c..e62d07f 100644 --- a/display.c +++ b/display.c @@ -257,7 +257,7 @@ make_lastline_link(Buffer *buf, char *title, char *url) parseURL2(url, &pu, baseURL(buf)); u = parsedURL2Str(&pu); if (DecodeURL) - u = Strnew_charp(url_unquote_conv(u->ptr, buf->document_charset)); + u = Strnew_charp(url_decode2(u->ptr, buf)); #ifdef USE_M17N u = checkType(u, &pr, NULL); #endif @@ -487,7 +487,7 @@ displayBuffer(Buffer *buf, int mode) term_title(conv_to_system(buf->buffername)); refresh(); #ifdef USE_IMAGE - if (activeImage && displayImage && buf->img) { + if (activeImage && displayImage && buf->img && buf->image_loaded) { drawImage(); } #endif @@ -497,6 +497,10 @@ displayBuffer(Buffer *buf, int mode) save_current_buf = buf; } #endif + if (mode == B_FORCE_REDRAW && (buf->check_url & CHK_URL) ) { + chkURLBuffer(buf); + displayBuffer(buf, B_NORMAL); + } } static void @@ -521,7 +525,15 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq, break; } if (hseq >= 0 && an->hseq == hseq) { + int start_pos = an->start.pos; + int end_pos = an->end.pos; for (i = an->start.pos; i < an->end.pos; i++) { + if (enable_inline_image && (l->propBuf[i] & PE_IMAGE)) { + if (start_pos == i) + start_pos = i + 1; + else if (end_pos == an->end.pos) + end_pos = i - 1; + } if (l->propBuf[i] & (PE_IMAGE | PE_ANCHOR | PE_FORM)) { if (active) l->propBuf[i] |= PE_ACTIVE; @@ -529,9 +541,9 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq, l->propBuf[i] &= ~PE_ACTIVE; } } - if (active) + if (active && start_pos < end_pos) redrawLineRegion(buf, l, l->linenumber - tline + buf->rootY, - an->start.pos, an->end.pos); + start_pos, end_pos); } else if (prevhseq >= 0 && an->hseq == prevhseq) { if (active) @@ -855,14 +867,16 @@ redrawLineImage(Buffer *buf, Line *l, int i) y = (int)(i * pixel_per_line); sx = (int)((rcol - COLPOS(l, a->start.pos)) * pixel_per_char); sy = (int)((l->linenumber - image->y) * pixel_per_line); - if (sx == 0 && x + image->xoffset >= 0) - x += image->xoffset; - else - sx -= image->xoffset; - if (sy == 0 && y + image->yoffset >= 0) - y += image->yoffset; - else - sy -= image->yoffset; + if (! enable_inline_image) { + if (sx == 0 && x + image->xoffset >= 0) + x += image->xoffset; + else + sx -= image->xoffset; + if (sy == 0 && y + image->yoffset >= 0) + y += image->yoffset; + else + sy -= image->yoffset; + } if (image->width > 0) w = image->width - sx; else @@ -1119,18 +1133,18 @@ addChar(char c, Lineprop mode) } #ifdef USE_M17N if (w == 2 && WcOption.use_wide) - addstr(graph2_symbol[(int)c]); + addstr(graph2_symbol[(unsigned char)c % N_GRAPH_SYMBOL]); else #endif - addch(*graph_symbol[(int)c]); + addch(*graph_symbol[(unsigned char)c % N_GRAPH_SYMBOL]); } else { #ifdef USE_M17N symbol = get_symbol(DisplayCharset, &w); - addstr(symbol[(int)c]); + addstr(symbol[(unsigned char)c % N_SYMBOL]); #else symbol = get_symbol(); - addch(*symbol[(int)c]); + addch(*symbol[(unsigned char)c % N_SYMBOL]); #endif } } diff --git a/doc-de/FAQ.html b/doc-de/FAQ.html new file mode 100644 index 0000000..d88ba64 --- /dev/null +++ b/doc-de/FAQ.html @@ -0,0 +1,691 @@ + + + + + + W3M FAQ + + +

    + Häufig gestellte Fragen zu w3m +

    +

    + Akinori Ito <aito@fw.ipsj.or.jp>
    korrigiert von Tom Berger <tom.be@gmx.net> +

    +

    + + Übersicht + +

    +
      +
    • + + + Allgemeine Fragen; wie bekomme ich das Programm, welche Arbeitsumgebung wird benötigt? + + +
      • +
        +
      • + + Wie wird w3m ausgesprochen? + +
        • +
      • + + Warum hat man es w3m genannt? + +
        • +
      • + + Auf welchen Plattformen läuft es? + +
        • +
      • + + Wo bekomme ich mehr Informationen über w3m? + +
        • +
      • + + Gibt es eine Mailingliste für w3m? + +
        • +
      • + + Gibt es das Programm fertig kompiliert? + +
        • +
      +
    • + + + Kompilierung und Installation + + +
      • +
    • + + + Optionen, Befehle und Verwendung + + +
      • +
        +
      • + + w3m beendet sich von selbst, wenn es ohne Argumente aufgerufen wurde. Was läuft hier falsch? + +
        • +
      • + + w3m startet mit schwarzen Zeichen vor schwarzem Hintergrund. Wie kann ich das ändern? + +
        • +
      • + + Kann w3m Dinge in Farbe darstellen? + +
        • +
      • + + Kann w3m mit monochromen Bildschirmen benutzt werden? + +
        • +
      • + + Wie kann ich den angezeigten Bereich verschieben? + +
        • +
      • + + Wie komme ich von einem zum anderen Hyperlink? + +
        • +
      • + + Grafische Browser stellen ein Wort rot dar, w3m hingegen nicht. Warum? + +
        • +
      • + + Wie ändere ich die für Hyperlinks, Bilder und Formularfelder benutzten Farben? + +
        • +
      • + + w3m scheint die Umgebungsvariable EDITOR zu ignorieren. Weshalb? + +
        • +
      • + + Wie breche ich eine Suche oder die Eingabe einer URL ab? + +
        • +
      +
    • + + + Fragen zur Benutzung als Internetbrowser + + +
      • +
        +
      • + + Wie fülle ich mit w3m Formulare aus? + +
        • +
      • + + w3m scheint langsamer als einige andere Browser zu sein. Warum? + +
        • +
      • + + Die Zeit zum Laden einer Seite wird nicht geringer, wenn diese Seite schon einmal angezeigt wurde. + +
        • +
      • + + Wie lade ich eine Datei herunter, auf die verlinkt wird? + +
        • +
      • + + Wie gebe ich einen Proxy-Server vor? + +
        • + +
      • + + Wie wähle ich den standardmäßig verwendeten Bildbetrachter aus? + +
        • +
      • + + Wie wird eine URL eingegeben? + +
        • +
      • + + w3m hängt eine URL an die vorherige an, obwohl die Zeile mit STRG-u gelöscht worden war. Was ist zu tun? + +
        • +
      +
    • + + + Verschiedenes + + +
      • +
        +
      • + + Ich suche die Konfigurationsdatei von w3m. + +
        • +
      • + + Wofür sind die w3mxxxx Dateien in meinem ~/.w3m Verzeichnis gut? + +
        • +
      +
    +

    + + Allgemeine Fragen; wie bekomme ich das Programm, welche Arbeitsumgebung wird benötigt? + +

    +
    +
    + + Wie wird w3m ausgesprochen? + +
    +
    +

    + Der Name wird englisch ausgesprochen W-three-M und reimt sich nicht auf pteranodon. +

    +
    +
    + + Warum hat man es w3m genannt? + +
    +
    +

    + Darin steckt der japanische Satz WWW-wo-Miru, was Sichte das weltweite Netz bedeutet. Dieser Browser könnte also auf deutsch Sdw2N heißen. +

    +
    +
    + + Auf welchen Plattformen läuft es? + +
    +
    +

    + Das Programm läuft auf verschiedenen Unices, seit der Version 990226 auf OS/2 und seit Version 990303 auch auf Microsoft-Windows mit Cygwin32. +

    +

    + Es wurde bestätigt, dass neuere Versionen laufen auf: +

    +
      +
    • + SunOS 4.1.x +
      • +
    • + HP-UX 9.x, 10.x +
      • +
    • + Solaris 2.5.x, 2.6, 8 +
      • +
    • + Linux 2.0.1 bis 3.17 +
      • +
    • + FreeBSD 2.2.8, 3.1, 3.2, 4.6 +
      • +
    • + NetBSD/macppc, m68k +
      • +
    • + EWS4800 Rel.12.2 Rev.A +
      • +
    • + Digital UNIX: v3.2D, v4.0D +
      • +
    • + IRIX 5.3, IRIX 6.5 +
      • +
    • + OS/2 mit emx +
      • +
    • + Windows 9x/NT mit Cygwin32 b20.1 +
      • +
    • + MS-DOS mit DJGPP und WATT32 Pakettreiber +
      • +
    • + MacOS X Server +
      • +
    • + MacOS X 10.1, 10.2 +
      • +
    +
    +
    + + Wo bekomme ich mehr Informationen über w3m? + +
    +
    +

    + Auf der englischen Homepage des w3m-Projekts. +

    +
    +
    + + Gibt es eine Mailingliste für w3m? + +
    +
    +

    + Es gibt eine Mailingliste für Entwickler (w3m-dev-en). Einzelheiten dazu finden Sie auf der Homepage des w3m-Projekts. Sie können Ihre Anmerkungen auch dem Autor schicken. +

    +
    +
    + + Gibt es das Programm fertig kompiliert? + +
    +
    +

    + Bis jetzt wurde das Programm nur für Windows /Cygnus32 kompiliert. Sollten Sie dies für andere Plattformen durchgeführt haben und möchten Ihre Binärversion der Allgemeinheit zur Verfügung stellen, kontaktieren Sie den Autor. +

    +
    +
    +

    + + Zurück zur Übersicht + +

    +

    + + Kompilierung und Installation + +

    +

    + Kein Problem :-) +

    +

    + + Optionen, Befehle und Verwendung + +

    +
    +
    + + w3m beendet sich von selbst, wenn es ohne Argumente aufgerufen wurde. Was läuft hier falsch? + +
    +
    +

    + w3m ist ein Textbetrachter. Deshalb schließt sich das Programm von selbst, wenn es ohne ein Argument aufgerufen wird. Es läuft weiter +

    +
      +
    • + mit einem Dateinamen oder einer Adresse als Argument +
      • +
    • + mit aus der Standardeingabe eingehenden Daten +
      • +
    • + nach Aufruf mit der Option -B, woraufhin die Lesezeichendatei gezeigt wird +
      • +
    • + nach Aufruf mit der Option -v, woraufhin eine Begrüßungsseite angezeigt wird +
      • +
    • + wenn die Variablen HTTP_HOME oder WWW_HOME spezifiziert wurden +
      • +
    +
    +
    + + w3m startet mit schwarzen Zeichen vor schwarzem Hintergrund. Wie kann ich das ändern? + +
    +
    +

    + Wenn w3m für den Farbmodus kompiliert wurde, geht das Programm von weißem Hintergrund aus und zeigt die Buchstaben in schwarz. +

    +

    + Sie können entweder die Hintergrundfarbe Ihres Terminals ändern (bei xterm z.B. mit der Option -bg) oder so vorgehen +

    +
      +
    1. + Mit w3m -M den Monochrom-Modus von w3m starten +
      2. +
    2. + o eintippen, was Sie in den Einstellungs-Dialog bringt +
      3. +
    3. + YES neben in Farbe anzeigen markieren und irgendeine Farbe auswählen. +
      4. +
    4. + auf [OK] klicken +
      5. +
    +
    +
    + + Kann w3m Dinge in Farbe darstellen? + +
    +
    +

    + Ja. Wenn Sie ./configure durchführen, werden Ihnen folgende Möglichkeiten angeboten: +

    +
    +  Let's do some configurations. Choose config option among the list. 
      1 - Baby model (no color, no menu, no mouse, no cookie, no SSL) 
      2 - Little model (color, menu, no mouse, no cookie, no SSL) 
      3 - Mouse model (color, menu, mouse, no cookie, no SSL) 
      4 - Cookie model (color, menu, mouse, cookie, no SSL)
      5 - Monster model (with everything; you need openSSL library) 
      6 - Customize Which?
+
    +

    + Sie entscheiden sich für 2, 3, 4, oder 5. +

    +
    +
    + + Kann w3m mit monochromen Bildschirmen benutzt werden? + +
    +
    +

    + Ja, Sie können entweder +

    +
      +
    • + obige Frage bei ./configure mit 1 beantworten, oder +
      • +
    • + w3m mit der Option -M starten, oder +
      • +
    • + innerhalb von w3m die Taste o betätigen, was den Einstellungs-Dialog öffnet, in dem Sie in Farbe anzeigen abschalten können. +
      • +
    +
    +
    + + Wie kann ich den angezeigten Bereich verschieben? + +
    +
    +

    + Indem Sie den Cursor an den Rand des Bildschirmes bewegen. Außerdem können Sie die folgenden Kommmandos nutzen +

    +
      +
    • SHIFT_LEFT und SHIFT_RIGHT, denen die Tasten > und < zugeordnet sind
      • +
    • SHIFT_LEFT1 und SHIFT_RIGHT1, denen die Tasten . und , zugeordnet sind
      • +
    +

    + Ein weiterer Weg wäre, mit der Option -geometry des Terminalprogramms den zur Anzeige verfügbaren Platz anzupassen, beispielsweise mit einer Eingabe der Art +

    + 
      xterm -geometry 110x45 -bg white -name w3m -e w3m -B
    +
    +
    + + Wie komme ich von einem zum anderen Hyperlink? + +
    +
    +

    + + Sie erreichen den nächsten Hyperlink mit der TAB-Taste. Zum vorhergehenden springt der Cursor, wenn die ESC-Taste vor der TAB-Taste gedrückt wurde. (Mehr zu Funktionen und Tastaturbelegung im Handbuch von w3m) + +

    +
    +
    + + Grafische Browser stellen ein Wort rot dar, w3m hingegen nicht. Warum? + +
    +
    +

    + w3m ignoriert das Attribut COLOR="..." in HTML. Dessen Berücksichtigung zu implementieren, wäre möglich, aber ich denke, die Dokumente wären am Ende schwerer lesbar. +

    +
    +
    + + Wie ändere ich die für Hyperlinks, Bilder und Formularfelder benutzten Farben? + +
    +
    +

    + Tippen Sie in w3m o ein und gelangen damit in den Einstellungs-Dialog. Dort können Sie die Farben ändern. +

    +
    +
    + + w3m scheint die Umgebungsvariable EDITOR zu ignorieren. Weshalb? + +
    +
    +

    + Tippen Sie in w3m o ein und gelangen damit in den Einstellungs-Dialog. Jeglicher Eintrag im Feld Editor hat Vorrang gegenüber der Umgebungsvariablen. +

    +

    + Wenn Sie also das durch EDITOR angegebene Textbearbeitungsprogramm verwenden möchten, löschen Sie den Eintrag und drücken [OK]. +

    +
    +
    + + Wie breche ich eine Suche oder die Eingabe einer URL ab? + +
    +
    +

    + Löschen Sie den eingegebenen Text mit STRG-u und drücken Sie die Eingabetaste. +

    +
    +
    +

    + + Zurück zur Übersicht + +

    +

    + + Fragen zur Benutzung als Internetbrowser + +

    +
    +
    + + Wie fülle ich mit w3m Formulare aus? + +
    +
    +

    + Formular-Eingabefelder werden in rot (oder invertiert) angezeigt. Bewegen Sie den Cursor dorthin. Wenn es +

    +
      +
    • + ein Texteingabefeld ist, drücken Sie die Eingabetaste, schreiben den Text unten in die Eingabezeile und drücken die Eingabetaste nochmals, +
      • +
    • + sich um einen Radiobutton oder eine Checkbox handelt, wird bei Drücken der Eingabetaste die Auswahl verändert oder neu getroffen +
      • +
    • + sich um einen Texteingabebereich handelt, wird durch Drücken der Eingabetaste ein Editor gestartet +
      • +
    • + sich um eine Schaltflächen für Übermitteln oder Zurücksetzen handelt, wird die entsprechende Aktion ausgeführt. +
      • +
    +
    +
    + + w3m scheint langsamer als einige andere Browser zu sein. Warum? + +
    +
    +

    + HTML-Dokumente werden in zwei Schritten verarbeitet. Erst nachdem ein Dokument vollständig vorliegt, baut w3m die Anzeige auf. +

    +

    + Da die meisten anderen Browser die Seite aufbauen, ehe sie komplett ist, scheinen sie schneller. +

    +
    +
    + + Die Zeit zum Laden einer Seite wird nicht geringer, wenn diese Seite schon einmal angezeigt wurde. + +
    +
    +

    + w3m nutzt keinen eigenen Zwischenspeicher. Es liest daher Dokumente jedesmal neu vom Server ein. Wenn möglich, verwenden Sie einen Server für die Zwischenspeicherung. +

    +
    +
    + + Wie lade ich eine Datei herunter, auf die verlinkt wird? + +
    +
    +

    + Verwenden Sie a (oder d bei lynx-artiger Tastaturbelegung) oder ESC RET. Wenn Sie ein eingebundenes Bild herunterladen möchten, drücken Sie ESC I. (Mehr zu Funktionen und Tastaturbelegung im Handbuch von w3m) +

    +
    +
    + + Wie gebe ich einen Proxy-Server vor? + +
    +
    +

    + Setzen Sie die Umgebungsvariablen HTTP_PROXY, HTTPS_PROXY, GOPHER_PROXY und FTP_PROXY oder öffnen mit o den Einstellungs-Dialog. Um beispielsweise den Port 8000 von proxy.example.org zu benutzen, geben Sie ein +

    + 
      http://proxy.example.org:8000/
    +
    + +
    + + Wie wähle ich den standardmäßig verwendeten Bildbetrachter aus? + +
    +
    +

    + Standardmäßig benutzt w3m den Bildbetrachter xv. Wenn Sie beispielsweise display vorziehen, ergänzen Sie ~/.w3m/mailcap oder /etc/mailcap um die Zeile: +

    +
    +  image/*; display %s
+
    +

    + Ebenso können Sie für andere Dateitypen externe Anzeigeprogramme festlegen: +

    +
    +  image/*; display %s 
    application/postscript; ghostview %s 
    application/x-dvi; xdvi %s
+
    +
    +
    + + Wie wird eine URL eingegeben? + +
    +
    +

    + Drücken Sie U +

    +
    +
    + + w3m hängt eine URL an die vorherige an, obwohl die Zeile mit STRG-u gelöscht worden war. Was ist zu tun? + +
    +
    +

    + Geben Sie die komplette Adresse ein, z.B. http://www.slashdot.org. +

    +
    +
    +

    + + Zurück zur Übersicht + +

    +

    + + Verschiedenes + +

    +
    +
    + + Ich suche die Konfigurationsdatei von w3m. + +
    +
    +

    + Es ist ~/.w3m/config. +

    + +

    + In dieser Datei kann jeder Benutzer das Verhalten von w3m anpassen. Sie finden dort zeilenweise die Variablen zu den im Einstellungs-Dialog beschriebenen Optionen. Den Namen und die Belegung einer Variable trennt ein Leerzeichen. +

    + +

    Ohne eine benutzerspezifische Konfigurationsdatei richtet sich w3m nach der systemweiten Konfigurationsdatei /etc/w3m/config. +

    + +
    +
    + + Wofür sind die w3mxxxx Dateien in meinem ~/.w3m Verzeichnis gut? + +
    +
    +

    + Es handelt sich um temporäre Dateien, die w3m beim Lesen anlegt. Sie dienen nicht zur Zwischenspeicherung und werden beim Verlassen des Programms normalerweise gelöscht. Wenn welche zurückbleiben, löschen Sie sie einfach selbst. +

    +
    +
    +

    + + Zurück zur Übersicht + +

    + + diff --git a/doc-de/MANUAL.html b/doc-de/MANUAL.html new file mode 100644 index 0000000..e12d3b3 --- /dev/null +++ b/doc-de/MANUAL.html @@ -0,0 +1,2353 @@ + + + + w3m Handbuch + + + + + + +

    w3m HANDBUCH

    +
    + Akinori Ito
    aito@fw.ipsj.or.jp +
    +

    Übersicht

    + +
    +

    + Einführung +

    +

    + w3m ist ein textorientierter Browser und Textbetrachter (Pager). In einem Terminalemulator können Sie damit lokale und andere Dokumente anzeigen lassen und Verknüpfungen (Hyperlinks) weiterverfolgen. +

    +
    +

    + Einstellungen +

    +

    + Der Aufruf per Befehlszeile lautet +

    + +
    +  w3m [Option]… [Datei|Adresse]…
+
    +

    + Wenn Sie Dateinamen oder Adressen in der Befehlszeile angeben, werden diese Dokumente angezeigt. Fehlen entsprechende Argumente, wird w3m ein Dokument aus der Standardeingabe erwarten und anzeigen. Erhält das Programm auch hier keine Daten, beendet es sich normalerweise selbstständig. +

    +

    + Optionen sind unter anderem: +

    +
    +

    Allgemeine Optionen

    +
    + -B +
    +
    +

    + + starte mit einer Ansicht aller Lesezeichen (wenn kein anderes Zielobjekt angegeben ist) +

    +
    +
    + -M +
    +
    +

    + + monochrome Anzeige +

    +
    +
    + -no-mouse +
    +
    +

    + Mausfunktion aus +

    +
    +
    + -num +
    +
    +

    + + zeige Zeilennummern an + +

    +
    + +
    + -v +
    +
    +

    + + begrüße den Benutzer mit einer eingebauten Seite (wenn kein anderes Zielobjekt angegeben ist) +

    +
    +
    + -W +
    +
    +

    + + wechsle zwischen umlaufendem und nicht umlaufendem Suchen +

    +
    +
    + -X +
    +
    +

    + nach Beenden des Programms das Terminal nicht neu initialisieren. +

    +
    +
    + +Zahl +
    +
    +

    + gehe zu Zeile Zahl. Wirkt nur, wenn Zahl größer ist als die im Terminal verfügbare Zeilenzahl +

    +
    +

    Browser-Optionen

    +
    + -cols Zahl +
    +
    +

    + + bei für die Standardausgabe bestimmten Inhalten, nimm bei zur Umsetzung von HTML eine Länge von num Zeichen pro Zeile +

    +
    +
    + -cookie +
    +
    +

    + + verwende gespeicherte Cookies und akzeptiere neue +

    +
    +
    + -no-cookie +
    +
    +

    + + verwende weder gespeicherte Cookies noch akzeptiere neue + +

    +
    +
    + -F +
    +
    +

    + + verarbeite Frames +

    +
    +
    + -no-graph +
    +
    +

    + + verwende bei der Umsetzung von Tabellen und Frames keine grafischen Zeichen +

    +
    +
    + -header Zeichenkette +
    +
    +

    + + füge der HTTP(S)-Anfrage Zeichenkette an. Diese muss der Kopfdaten-Syntax "Variable: Wert" entsprechen +

    +
    +
    + -m +
    +
    +

    + arbeite im Internetnachrichten-Modus. Mit dieser Option entnimmt w3m den Typ eines Dokumentes dessen Kopfdaten. Dies ist nützlich beim Lesen von Mails und Usenet-Nachrichten. + +

    +
    +
    + -no-proxy +
    +
    +

    + + verwende keinen Proxy +

    +
    +
    + -post Datei +
    +
    +

    + verwende die Methode POST, um in Datei hinterlegte Daten hochzuladen. Hierbei wird die Syntax "var1=wert1[&var2=wert2]…" erwartet +

    +
    +

    Textbetrachter-Optionen

    +
    + -l Zahl +
    +
    +

    + + Anzahl der Zeilen, die zwischengespeichert werden, wenn Text per Standardeingabe übergeben wurde. (Voreinstellung ist 10000) +

    +
    +
    + -r +
    +
    +

    + + verarbeite spezielle Escape-Zeichen (beispielsweise ANSI-Escape-Zeichen oder nroff-Rückwärtsschritte für fette und unterstrichene Zeichen) nicht, sondern zeige sie stattdessen mittels Caret-Notation. +

    +
    +
    + -s +
    +
    +

    + + mehrere leere Zeilen werden bis auf eine gelöscht +

    +
    + +
    + -t Zahl +
    +
    +

    + Tab-Zeichen so verwerten, dass Spalten mit einer Weite von Zahl Zeichen entstehen. Wirkt nicht auf Standardausgabe +

    +
    +

    Datenart- und Datenkodierungs-Optionen

    +
    + -I Zeichenkodierung +
    +
    +

    + + zu benutzende Zeichenkodierung für erhaltene Daten +

    +
    +
    + -O Zeichenkodierung +
    +
    +

    + + zu benutzende Zeichenkodierung für auszugebende Daten +

    +
    +
    + -T Typ +
    +
    +

    + + legt den MIME-Typ erhaltener Daten fest. Ohne diese Option bestimmt ihn das Programm anhand der Dateinamen-Erweiterung. Wenn dies fehlschlägt, wird text/plain als Typ angenommen. Zum Beispiel: +

    +

    + Übernimm HTML-Dokument von der Standardeingabe und zeige es an +

    +
    +   cat beispiel.html | w3m -T text/html
+
    +

    + Zeige HTML-Quelltext an +

    +
    +   w3m -T text/plain beispiel.html
+
    +
    +

    Optionen zur Datenausgabe, mit sofortigem Verlassen des Programms

    +
    + -dump +
    +
    +

    + lies das per URL angegebene Dokument und leite es verarbeitet der Standardausgabe zu. Wenn mit der Option -cols nichts anderes eingestellt ist, erhält es eine Breite von 80 Zeichen +

    +
    +
    + -dump_source +
    +
    +

    + + leite den Seitenquelltext der Standardausgabe zu +

    +
    +
    + -dump_head +
    +
    +

    + + leite die Antwort einer HEAD-Anfrage für eine URL der Standardausgabe zu +

    +
    +
    + -dump_both +
    +
    +

    + + leite Antwort auf HEAD-Anfrage und Seitenquelltext der Standardausgabe zu + +

    +
    +
    + -dump_extra +
    +
    +

    + + leite Antwort auf HEAD-Anfrage, Seitenquelltext und Extrainformation der Standardausgabe zu +

    +
    + +

    Optionen, die Standards für Einstellungen und Datenquellen außer Kraft setzen

    + +
    + -bookmark Datei +
    +
    +

    + + benutze anstelle der Standarddatei bookmark.html für Lesezeichen die Datei Datei +

    +
    +
    + -config Datei +
    +
    +

    + + benutze Datei anstelle der Standard-Konfigurationsdatei +

    +
    +
    + -o Option=Wert +
    +
    +

    + + arbeite mit einer Konfiguration, bei der die Einstellung Option mit Wert belegt ist. Ohne Option=Wert gleichwertig mit -show-option +

    +
    +
    +
    +

    + Farbzuordnung im Dokument +

    +

    + Links und Bildelemente werden wie folgt angezeigt: +

    +
    + + + + + + + + + + + + + + + + + + + +
    + + Farbmodus + + Monochrom-Modus +
    + Hyperlinks + + blau + + unterstrichen +
    + Bilder + + grün + + invertiert +
    + Formular-Eingabefelder + + rot + + invertiert +
    +
    +

    + Diese Farben können nach Eingabe von o im Einstellungs-Dialog anders zugeordnet werden. +

    +
    +

    + Funktionen und Tastaturbelegung +

    + +

    + Wenn w3m läuft, bedienen Sie das Programm, indem Sie Funktionen anhand ihres Namens oder der ihr zugeordneten Tastenkombination aufrufen. Es gibt voreingestellte Tastaturbelegungen. + +

    + +

    + Sie können die Tastaturbelegungen (abgesehen von jenen des Menü- und des Texteingabe-Modus) in einer Datei ~/.w3m/keymap anpassen. Beispielsweise bindet +

    + +
    +   keymap C-o NEXT_PAGE
+
    + +

    + die Funktion NEXT_PAGE (die normalerweise mit SPC und C-v verknüpft ist) mit C-o. Siehe die Liste verfügbarer Funktionen in README.func. Original- und Lynx-artige Tastaturbelegungen enthalten die Beispieldateien keymap.default und keymap.lynx. +

    + +

    + Im Folgenden stehen C- und M- für die Eingabe-Modifikationen mit der Steuerungs- und der Meta-Taste. Die letztere ersetzt die ALT-Taste, wohingegen Drücken der ESC-Taste zwischen Meta-modifiziertem und einfachen Tastendruck wechselt. Das Minus-Zeichen bedeutet das gleichzeitige Drücken von Tasten; der Leerraum dagegen steht dafür, dass eine Taste nach der anderen gedrückt wird. Mit 2 M ist also gemeint, die 2 und dann M zu drücken. +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Funktion + Tastenkombination + + Beschreibung +
    + Standard + + Lynx-ähnlich +
    +

    Navigation innerhalb von Seiten

    +
    + NEXT_PAGE + + SPC, C-v, +, PGDN + + SPC, C-v, + + + Scrolle eine Seite abwärts +
    + PREVIOUS_PAGE + + b, M-v, -, PGUP + + b, M-v, - + + Scrolle eine Seite aufwärts +
    + MOVE_RIGHT + + l, C-f, RIGHT + + l + + Bewege Cursor nach rechts (mit Verschiebung um halbe Bildschirmbreite an dessen Rand) +
    + C-b, LEFT + + h, C-b, LEFT + + h + + Bewege Cursor nach links (mit Verschiebung um halbe Bildschirmbreite an dessen Rand) +
    + MOVE_DOWN + + j, C-n, DOWN + + j + + Bewege Cursor abwärts (scrolle eine Zeile am Bildschirmrand) +
    + MOVE_UP + + k, C-p, UP + + k + + Bewege Cursor aufwärts (scrolle eine Zeile am Bildschirmrand) +
    + UP + + J + + J + + Scrolle den Anzeigebereich eine Zeile aufwärts +
    + DOWN + + K + + K + + Scrolle den Anzeigebereich eine Zeile abwärts +
    + LINE_BEGIN + + ^, C-a + + ^ + + Gehe zum Zeilenanfang +
    + LINE_END + + $, C-e + + $ + + Gehe zum Zeilenende +
    + NEXT_WORD + + w + + w + + Gehe zum nächsten Wort +
    + PREVIOUS_WORD + + W + + W + + Gehe zum vorherigen Wort +
    + SHIFT_RIGHT + + > + + > + + Anzeigebereich nach rechts versetzen +
    + SHIFT_LEFT + + < + + < + + Anzeigebereich nach links versetzen +
    + RIGHT + + . + + . + + Anzeigebereich um eine Spalte nach rechts verschieben +
    + LEFT + + , + + , + + Anzeigebereich um eine Spalte nach links verschieben +
    + BEGIN + + g, M-<, HOME + + C-a, M-< + + Gehe zur ersten Zeile +
    + END + + G, M->, END + + C-e, M-> + + Gehe zur letzten Zeile +
    + GOTO_LINE + + M-g + + G + + Gehe zur angegebenen Zeile +
    + LINE_INFO + + C-g + + C-g + + Zeige aktuelle Position im Dokument an +
    + CENTER_H + + Z + + Z + + Bildschirm rechts und links des Cursors zentrieren +
    + CENTER_V + + z + + z + + Bildschirm ober- und unterhalb des Cursors zentrieren +
    + NEXT_LINK + + TAB + + TAB, C-n, DOWN + + Gehe zum nächsten Hyperlink +
    + PREVIOUS_LINK + + M-TAB, C-u + + M-TAB, C-u, C-p, UP + + Gehe zum vorangegangen Hyperlink +
    + LINK_BEGIN + + [ + + [ + + Gehe zum ersten Hyperlink +
    + LINK_END + + ] + + ] + + Gehe zum letzten Hyperlink +
    MOVE_LIST_MENUM-mM-mÖffne Menü mit vorhandenen Hyperlinks
    +

    Umgang mit Hyperlinks

    +
    + GOTO_LINK + + C-j, C-m, RET + + C-f, C-j, C-m, RET, RIGHT + + Folge dem aktuellen Hyperlink in neuem Puffer +
    LIST_MENUM-lM-lÖffne Menü mit Hyperlinks und folge dem ausgewählten
    + SAVE_LINK + + a, M-RET + + d, M-RET + + Speichere Ziel des Hyperlinks +
    + PEEK_LINK + + u + + u + + Zeige Zieladresse +
    + PEEK_IMG + + i + + i + + Zeige Adresse des Bildes +
    + VIEW_IMAGE + + I + + I + + Zeige Bild in Betrachter +
    + SAVE_IMAGE + + M-I + + M-I + + Speichere Bild +
    MARK_WORD;;Wandle aktuelles Wort in Hyperlink um
    + MARK_URL + + : + + : + + Wandle URL-artige Zeichenketten um in Hyperlinks +
    + MARK_MID + + M-: + + M-: + + + Wandle Nachrichten-ID-artige Zeichenketten um in Hyperlinks +
    + PEEK + + c + + c + + Zeige aktuelle Adresse an +
    + INFO + + = + + = + + Zeige Informationen über dieses Dokument +
    + HISTORY + + C-h + + C-h + + Chronik aufgesuchter Dokumente +
    + EXTERN + + M + + M + + Zeige das aktuelle Dokument mit einem externen Browser (wird eine Taste von 2 bis 9 gedrückt, also beispielsweise 3 M, eingegeben, kommt ein anderer, in der Konfiguration hinterlegter Browser zum Einsatz) +
    + EXTERN_LINK + + M-M + + M-M + + Bringe das Linkziel mit einem externen Browser zur Anzeige (vorangestellte Zahlen wirken sich wie oben beschrieben aus) +
    +

    Verwalten von Lesezeichen

    +
    + BOOKMARK + + M-b + + v, M-b + + Lesezeichen ansehen +
    + ADD_BOOKMARK + + M-a + + a, M-a + + Lege für aktuelle Seite Lesezeichen an +
    +

    Umgang mit Dateien und Datenströmen

    +
    + GOTO + + U + + g, U + + Öffne angegebenes Dokument in neuem Puffer +
    GOTO_RELATIVEM-uM-uÖffne relative Adresse in neuem Puffer
    + LOAD + + V + + V + + Öffne lokale Datei in einem neuen Puffer +
    + READ_SHELL + + @ + + @ + + + + Führe einen Shell-Befehl aus und zeige Ausgabe in einem neuen Puffer +
    + PIPE_SHELL + + # + + # + + + + Führe einen Shell-Befehl aus und zeige Ausgabe in einem neuen Puffer +
    +

    Arbeit an Seiteninhalten

    +
    + VIEW + + v + + \ + + Wechsle zwischen HTML-Quellcode und verarbeitetem Dokument +
    LISTLLListe Link-Elemente, Hyperlinks und Bilder auf
    + FRAME + + F + + F + + Wechsle zwischen Kennung und Umsetzung von HTML-Frames +
    + REDRAW + + C-l + + C-l, C-w + + Bildschirmanzeige neu aufbauen +
    + RELOAD + + R + + R, C-r + + Aktuelles Dokument erneut laden +
    + EDIT + + E + + E + + Bearbeite lokales Quelldokument +
    + EDIT_SCREEN + + M-e + + M-e + + Bearbeite eine Kopie des verarbeiteten Dokuments +
    PIPE_BUF||Leite aktuellen Pufferinhalt einem Shell-Befehl zu und zeige Ausgabe an
    + DOWNLOAD + + M-s + + M-s + + Dokument-Quellcode speichern +
    + SAVE_SCREEN + + S + + S, p + + Speichere verarbeitetes Dokument +
    +

    Navigation zwischen Puffern und Reitern

    +
    + BACK + + B + + B, C-b, LEFT + + Schließe aktuellen Puffer und kehre zu dem im Stapel darunterliegenden zurück +
    + GOTO_HOME + + C-_ + + + Zurück zur Startseite (die Variablen HTTP_HOME oder WWW_HOME spezifiziert wurden) +
    + SELECT_MENU + + s + + s, C-h + + Öffne Pufferstapel-Menü +
    + TAB_MENU + + M-t + + M-t + + Öffne das Reiter-Auswahl-Menü +
    + NEW_TAB + + T + + T + + Öffne neuen Reiter (mit aktuellem Dokument) +
    + TAB_LINK + + C-t + + C-t + + Folge dem aktuellen Hyperlink in einem neuen Reiter +
    + NEXT_TAB + + } + + } + + Schalte zum nächsten Reiter +
    + PREV_TAB + + { + + { + + Schalte zum vorherigen Reiter +
    + CLOSE_TAB + + C-q + + C-q + + Schließe aktuellen Reiter +
    +

    Suchfunktionen

    +
    + SEARCH + + / + + /, C-s + + Suche vorwärts +
    + SEARCH_BACK + + ? + + + Suche rückwärts +
    + ISEARCH + + C-s + + + Inkrementelle Suche vorwärts +
    + ISEARCH_BACK + + C-r + + + Inkrementelle Suche rückwärts +
    + SEARCH_NEXT + + n + + n + + Setze Suche vorwärts fort +
    + SEARCH_PREV + + N + + + Setze Suche rückwärts fort +
    + WRAP_TOGGLE + + C-w + + w + + Wechsle zwischen umlaufendem und nicht-umlaufendem Suchen +
    +

    Arbeit mit Textmarken

    +
    + MARK + + C-SPC + + C-SPC + + Setze/Lösche Markierung +
    + PREV_MARK + + M-p + + P + + Gehe zur vorherigen Markierung +
    + NEXT_MARK + + M-n + + N + + Gehe zur nächsten Markierung +
    + REG_MARK + + " + + " + + Markiere alle Vorkommen eines Zeichenmusters +
    +

    Verschiedenes

    +
    + COMMAND + + M-c + + M-c + + Rufe eine oder mehrere durch Strichpunkt getrennte w3m-Funktionen auf +
    + HELP + + H + + H, ? + + Zeige Hilfe-Übersicht +
    + OPTIONEN + + o + + o + + Einstellungs-Dialog öffnen +
    SET_OPTIONM-oM-oSetze Option
    DEFINE_KEYM-kM-kDefiniere eine Verbindung zwischen einer Tastenkombination und einem Kommando
    MOUSE_TOGGLEmmSchalte Mausbedienung an oder ab
    DOWNLOAD_LISTDDÜbersicht heruntergeladener Dateien anzeigen
    + COOKIE + + C-k + + C-k + + Zeige die gespeicherten Cookies +
    UNDO((Nimm die letzte Cursorbewegung zurück
    REDO))Den letzten Rücknahmebefehl zurücknehmen
    + EXEC_SHELL + + ! + + ! + + Shell-Befehl ausführen +
    DICT_WORDM-wM-wFühre eine Wörterbuch-Funktion aus (siehe README.dict)
    DICT_WORD_ATM-WM-WBenutze Wörterbuch für Wort unter Cursor
    VERSIONrrZeige die Version von w3m an
    + SUSPEND + + C-z + + C-z + + w3m zum Hintergrundprozess machen. (Wird mit dem Shell-Befehl fg zurückgenommen.) +
    + QUIT + + q + + q + + Mit Bestätigungsfrage beenden +
    + EXIT + + Q + + Q + + Sofort beenden +
    + +

    + Darüber hinaus gibt es die folgenden Bedien-Modi mit fester Tastaturbelegung für die entsprechenden Funktionen. Diese sind nicht durch die Funktion DEFINE_KEY oder Einträge der keymap-Datei veränderbar. +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Funktion
    (interner Name) +     		Tastenkombination + + Beschreibung +
    +

    Menü-Auswahl-Modus

    +
    + BUF:NEXT + j, C-n, DOWN + + Nächster Eintrag +
    BUF:PREV + + k, C-p, UP + + Vorheriger Eintrag +
    + BUF:DELETE + D + + Lösche Eintrag +
    + BUF:GO + + SPC, RET, RIGHT + + Wähle Eintrag aus +
    +

    Popup-Menü-Modus

    +
    +MENU:SELECT + + SPC, RET, RIGHT + Wähle Punkt aus +
    +MENU:CLOSE + C-c + + Schließe Menü +
    +MENU:CANCEL + + LEFT, BKSPC, C-h + Einen Auswahlschritt zurück +
    +MENU:DOWN + j, C-n, DOWN + + Gehe zum nächsten Punkt +
    +MENU:UP + + k, C-p, UP + Gehe zum vorherigen Punkt +
    +MENU:LINE_UP + K + + Scrolle einen Punkt aufwärts +
    +MENU:LINE_DOWN + J + + Scrolle einen Punkt abwärts +
    +MENU:TOP + C-a + + Gehe zum ersten Punkt +
    +MENU:LAST + C-e + + Gehe zum letzten Punkt +
    +MENU:NEXT + C-v, C-f + Gehe zur nächsten Seite +
    +MENU:PREV + ESC v, C-b + + Gehe zur vorherigen Seite +
    +MENU:SEARCH_FORE + C-s, / + + Suche vorwärts +
    +MENU:SEARCH_BACK + + C-r, ? + Suche rückwärts +
    +MENU:SEARCH_NEXT + + n + Suche weitere Übereinstimmung
    +MENU:SEARCH_PREV + + N + Suche frühere Übereinstimmung
    +

    Eingabezeile-Bearbeitungs-Modus

    +
    + LINEEDIT:FORWARD + + C-f, RIGHT + + Bewege Cursor vorwärts +
    +LINEEDIT:BACK + + C-b, LEFT + + Bewege Cursor rückwärts +
    +LINEEDIT:BS + + C-h, BKSPC + + Vorheriges Zeichen löschen +
    +LINEEDIT:DEL + + C-d + + Aktuelles Zeichen löschen +
    +LINEEDIT:KILL_AFTER + + C-k + + Lösche alles nach dem Cursor +
    +LINEEDIT:KILL_BEFORE + + C-u + + Lösche alles vor dem Cursor +
    +LINEEDIT:TOP + + C-a + + Gehe zum Zeilenanfang +
    +LINEEDIT:BOTTOM + + C-e + + Gehe zum Zeilenende +
    +LINEEDIT:PREV + + C-p, UP + + Hole den vorherigen Chronik-Eintrag +
    +LINEEDIT:NEXT + + C-n, DOWN + + Hole den nächsten Chronik-Eintrag +
    +LINEEDIT:COMPLETE + + TAB, SPC + + Versuche, den Dateinamen zu komplettieren +
    +LINEEDIT:EDITOR + + C-o + + Bearbeite mit externem Editor +
    +LINEEDIT:ACCEPT + + RET + + Eingabezeile übernehmen +
    + + +
    +

    + Bedienung per Maus +

    +

    + Wenn w3m mit Mausfunktionen kompiliert wurde und Sie das Programm entweder in einer Konsole mit GPM oder in einem X-Terminal-Emulator starten, ist ein Navigieren mit der Maus möglich. (Im Falle von rxvt müssen Sie die Umgebungsvariable TERM mit xterm oder kxterm belegen.) +

    +

    Die Datei README.mouse erklärt, wie die Bedienung per Maus an eigene Vorlieben angepasst werden kann. +

    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Handlung + Beschreibung +
    + Linksklick + +Zuerst:
    Der Cursor wird an die Mauszeigerposition versetzt.
    Dann:
    Dem Hyperlink, auf dem der Cursor momentan steht und auf den sich der Mauszeiger richtet, wird gefolgt. +
    + Mittelklick + + Zurück zum vorherigen Puffer. +
    + Rechtsklick + + Öffne Menü. Sie können Menüpunkte durch Anklicken auswählen. +
    + Linksziehen + + Dokument scrollen. Standardmäßig wird das Dokument im Fenster verschoben. Ein Verschieben des Fensters über dem stehenden Dokument erreichen Sie über den Einstellungs-Dialog. +
    +
    +

    + Lokale CGI-Skripte +

    +

    + w3m ist in der Lage, CGI-Skripte direkt laufen zu lassen. Dies bedeutet, dass sich das Programm wie ein HTTP-Server verhält und das CGI-Skript ausführt und dessen Ausgabe anzeigt. Beispielsweise wurden die Lesezeichen-Registrierung und der Verzeichnis-Browser als lokale CGI-Skripte programmiert. Darüber hinaus kann w3m durch solche Skripte als Schnittstelle zum Einholen von Daten aller Art fungieren. +

    +

    + Aus Sicherheitsgründen kommen für von w3m benutzte CGI-Skripte nur folgende Verzeichnisse in Frage: +

    +
      +
    • + Das Verzeichnis, in dem w3m-bezogene Dateien abgelegt sind (typischerweise /usr/local/lib/w3m). Auf dieses Verzeichnis kann mit der Variblen $LIB referenziert werden. +
      • +
    • + Das Verzeichnis /cgi-bin/. Sie können /cgi-bin/ im Feld Verzeichnis für ausführbare Skripte des Einstellungs-Dialogs jedem gewünschten Verzeichnis zuordnen. Mehrere Pfade lassen sich durch Doppelpunkt getrennt angeben, also in der Form /usr/local/cgi-bin:/home/aito/cgi-bin. Es wird davon abgeraten, das aktuelle Verzeichnis hier mitaufzunehmen. Zum Zugriff auf Skripte im Verzeichnis /cgi-bin/ erwartet w3m eine URL folgender Art: +
      • +
      + w3m -o cgi_bin=/path/to/cgi-bin file:/cgi-bin/script.cgi
+
      +
    +

    + Das CGI-Skript kann zur Steuerung von w3m die spezielle Kopfzeile w3m-control: enthalten. Darin können alle Funkionen (siehe README.func) eingetragen sein. Die angegebene Funktion wird aufgerufen, nachdem das Dokument angezeigt wird. Beispielsweise, wird eine Skriptausgabe +

    +
    +Content-Type: text/plain
    W3m-control: BACK
+
    +

    + eine leere Seite anzeigen und den Puffer sofort löschen. Dies ist nützlich, wenn es nicht gewünscht ist, die Seite nach Aufrufen des Skriptes anzuzeigen. Das nächste Beispiel +

    +
    +Content-Type: text/plain
    W3m-control: DELETE_PREVBUF contents.....
+
    +

    + führt zum Übergehen des aktuellen Puffers. +

    +

    + Jede w3m-control-Kopfzeile kann nur eine Funktion aufrufen. Jedoch können Sie im Kopfteil einer HTTP-Kommunikation mehr als eine w3m-control-Anweisung hinterlegen. Überdies ist es möglich, die GOTO-Funktion mit einem Argument aufzurufen: +

    +
    +Content-Type: text/plain
    W3m-control: GOTO http://www.example.org/
+
    +

    + Sie bewirken damit das gleiche wie mit der Anweisung Location: im Kopfteil: +

    +
    +Content-Type: text/plain
    Location: http://www.example.org/
+
    +

    + Beachten Sie, dass diese Anweisung wirkungslos ist, wenn das CGI-Skript durch einen HTTP-Server angesprochen wird. +

    + + diff --git a/doc-de/README.func b/doc-de/README.func new file mode 100644 index 0000000..036ae9d --- /dev/null +++ b/doc-de/README.func @@ -0,0 +1,147 @@ +ABORT Sofort beenden +ACCESSKEY Öffne Zugangstasten-Menü +ADD_BOOKMARK Lege für aktuelle Seite Lesezeichen an +ALARM Alarm einrichten +BACK Schließe aktuellen Puffer und kehre zu dem im Stapel darunterliegenden zurück +BEGIN Gehe zur ersten Zeile +BOOKMARK Lesezeichen ansehen +CENTER_H Um Cursor herum horizontal zentrieren +CENTER_V Um Cursor herum vertikal zentrieren +CHARSET Ändere die Zeichenkodierung für das aktuelle Dokument +CLOSE_TAB Schließe Reiter +CLOSE_TAB_MOUSE Schließe Reiter bei Mauszeiger +COMMAND Rufe w3m Funktion(en) auf +COOKIE Cookie-Liste ansehen +DEFAULT_CHARSET Ändere die Voreinstellung für die Zeichenkodierung +DEFINE_KEY Definiere eine Verbindung zwischen einer Tastenkombination und einem Kommando +DELETE_PREVBUF Lösche vorherigen Puffer (hauptsächlich für lokale CGI-Skripte) +DICT_WORD Führe eine Wörterbuch-Funktion aus (siehe README.dict) +DICT_WORD_AT Benutze Wörterbuch für Wort unter Cursor +DISPLAY_IMAGE Starte das Laden und die Erstellung von Bildern erneut +DOWN Scrolle den Anzeigebereich eine Zeile abwärts +DOWNLOAD Dokument-Quellcode speichern +DOWNLOAD_LIST Die Übersicht heruntergeladener Dateien zeigen +EDIT Bearbeite lokales Quelldokument +EDIT_SCREEN Bearbeite eine Kopie des verarbeiteten Dokuments +END Gehe zur letzten Zeile +EXEC_SHELL Führe Shell-Befehl aus und zeige Ausgabe an +EXIT Sofort beenden +EXTERN Verwende externen Browser zur Anzeige +EXTERN_LINK Verwende externen Browser zur Anzeige des Linkziels +FRAME Wechsle zwischen Kennung und Umsetzung von HTML-Frames +GOTO Öffne angegebenes Dokument in neuem Puffer +GOTO_HOME Zurück zur Startseite (die Variablen HTTP_HOME oder WWW_HOME spezifiziert wurden) +GOTO_LINE Gehe zur angebenen Zeile +GOTO_LINK Folge dem aktuellen Hyperlink in neuem Puffer +GOTO_RELATIVE Gehe zu relativer Adresse +HELP Zeige Hilfe-Übersicht +HISTORY Chronik aufgesuchter Dokumente +INFO Zeige Informationen über dieses Dokument +INTERRUPT w3m zum Hintergrundprozess machen +ISEARCH Inkrementelle Suche vorwärts +ISEARCH_BACK Inkrementelle Suche rückwärts +LEFT Anzeigebereich um eine Spalte nach links verschieben +LINE_BEGIN Gehe zum Zeilenanfang +LINE_END Gehe zum Zeilenende +LINE_INFO Zeige aktuelle Position im Dokument an +LINK_BEGIN Gehe zum ersten Hyperlink +LINK_END Gehe zum letzten Hyperlink +LINK_MENU Öffne Menü mit den Link-Elementen +LIST Zeige alle referenzierten URLs +LIST_MENU Öffne Menü mit aufsuchbaren Hyperlinks +LOAD Öffne lokale Datei in einem neuen Puffer +MAIN_MENU Öffne Menü +MARK Setze/Lösche Markierung +MARK_MID Wandle Nachrichten-ID-artige Zeichenketten um in Hyperlinks +MARK_URL Wandle URL-artige Zeichenketten um in Hyperlinks +MARK_WORD Wandle aktuelles Wort in Hyperlink um +MENU Öffne Menü +MENU_MOUSE Öffne Menü beim Mauszeiger +MOUSE_TOGGLE Schalte Mausbedienung an oder ab +MOVE_DOWN Cursor abwärts +MOVE_DOWN1 Cursor abwärts; am Rand gleitend bewegen +MOVE_LEFT Cursor nach links +MOVE_LEFT1 Cursor nach links; am Rand gleitend bewegen +MOVE_LIST_MENU Öffne Menü mit vorhandenen Hyperlinks +MOVE_MOUSE Cursor auf Mauszeigerposition setzen +MOVE_RIGHT Cursor nach rechts +MOVE_RIGHT1 Cursor nach rechts; am Rand gleitend bewegen +MOVE_UP Cursor aufwärts +MOVE_UP1 Cursor aufwärts; am Rand gleitend bewegen +MSGS Zeige Fehlermeldungen an +NEW_TAB Öffne neuen Reiter (mit aktuellem Dokument) +NEXT Schalte zum nächsten Puffer +NEXT_DOWN Gehe abwärts zum nächsten Hyperlink +NEXT_HALF_PAGE Scrolle eine halbe Seite abwärts +NEXT_LEFT Gehe zum nächsten Hyperlink links +NEXT_LEFT_UP Gehe zum nächsten Hyperlink links oder oberhalb +NEXT_LINK Gehe zum nächsten Hyperlink +NEXT_MARK Gehe zur nächsten Markierung +NEXT_PAGE Eine Seite abwärts +NEXT_RIGHT Gehe zum nächsten Hyperlink rechts +NEXT_RIGHT_DOWN Gehe zum nächsten Hyperlink rechts oder unterhalb +NEXT_TAB Schalte zum nächsten Reiter +NEXT_UP Gehe zum nächsten Hyperlink oberhalb +NEXT_VISITED Gehe zum nächsten besuchten Hyperlink +NEXT_WORD Gehe zum nächsten Wort +NOTHING Tue nichts +NULL Tue nichts +OPTIONS Zeige Einstellungen für Änderungen +PEEK Zeige aktuelle Adresse an +PEEK_IMG Zeige Adresse des Bildes +PEEK_LINK Zeige Zieladresse +PIPE_BUF Leite aktuellen Pufferinhalt einem Shell-Befehl zu und zeige Ausgabe an +PIPE_SHELL Führe Shell-Befehl aus und zeige Ausgabe an +PREV Schalte zum vorherigen Puffer +PREV_HALF_PAGE Scrolle eine halbe Seite aufwärts +PREV_LINK Gehe zum vorangegangen Hyperlink +PREV_MARK Gehe zur vorherigen Markierung +PREV_PAGE Eine Seite aufwärts +PREV_TAB Schalte zum vorherigen Reiter +PREV_VISITED Gehe zum vorherigen besuchten Hyperlink +PREV_WORD Gehe zum vorherigen Wort +PRINT Speichere verarbeitetes Dokument +QUIT Mit Bestätigungsfrage beenden +READ_SHELL Führe Shell-Befehl aus und zeige Ausgabe an +REDO Den letzten Rücknahmebefehl zurücknehmen +REDRAW Bildschirmanzeige neu aufbauen +REG_MARK Zu einem Muster passenden Zeichenfolgen überall markieren +REINIT Konfigurationsdatei erneut laden +RELOAD Aktuelles Dokument erneut laden +RESHAPE Dokument nochmals verarbeiten +RIGHT Anzeigebereich um eine Spalte nach rechts verschieben +SAVE Dokument-Quellcode speichern +SAVE_IMAGE Speichere Bild +SAVE_LINK Speichere Ziel des Hyperlinks +SAVE_SCREEN Speichere verarbeitetes Dokument +SEARCH Suche vorwärts +SEARCH_BACK Suche rückwärts +SEARCH_FORE Suche vorwärts +SEARCH_NEXT Setze Suche vorwärts fort +SEARCH_PREV Setze Suche rückwärts fort +SELECT Zeige Puffferstapel-Übersicht +SELECT_MENU Öffne Puffferstapel-Menü +SETENV Setze Umgebungsvariable +SET_OPTION Setze Option +SHELL Führe Shell-Befehl aus und zeige Ausgabe an +SHIFT_LEFT Anzeigebereich nach links versetzen +SHIFT_RIGHT Anzeigebereich nach rechts versetzen +SOURCE Wechsle zwischen HTML-Wiedergabe und -Verarbeitung +STOP_IMAGE Bilder nicht mehr laden und anzeigen +SUBMIT Formular übermitteln +SUSPEND w3m zum Hintergrundprozess machen +TAB_GOTO Öffne das angegebene Dokument in einem neuen Reiter +TAB_GOTO_RELATIVE Öffne relative Adresse in einem neuen Reiter +TAB_LEFT Einen Reiter weiter nach links gehen +TAB_LINK Folge dem aktuellen Hyperlink in einem neuen Reiter +TAB_MENU Öffne das Reiter-Auswahl-Menü +TAB_MOUSE Wähle per Maus Reiter aus +TAB_RIGHT Einen Reiter weiter nach rechts gehen +UNDO Nimm die letzte Cursorbewegung zurück +UP Scrolle den Anzeigebereich eine Zeile aufwärts +VERSION Zeige die Version von w3m an +VIEW Wechsle zwischen HTML-Wiedergabe und -Verarbeitung +VIEW_BOOKMARK Lesezeichen ansehen +VIEW_IMAGE Zeige Bild in Betrachter +WHEREIS Suche vorwärts +WRAP_TOGGLE Wechsle zwischen umlaufendem und nicht-umlaufendem Suchen diff --git a/doc-de/w3m.1 b/doc-de/w3m.1 new file mode 100644 index 0000000..7deb203 --- /dev/null +++ b/doc-de/w3m.1 @@ -0,0 +1,334 @@ +.nr N -1 +.nr D 5 +.\"******************************************************************* +.\" +.\" This file was generated with po4a. Translate the source file. +.\" +.\"******************************************************************* +.TH W3M 1 2016\-08\-06 "w3m 0.5.3" +.SH NAME +w3m \- Ein auf Texte ausgerichtetes Programme zur Anzeige von Dateien und +Datenströmen sowie zum Browsen im Internet +.SH SYNOPSIS +w3m [OPTION]... [ \fIDatei\fP | \fIURL\fP ]... +.SH BESCHREIBUNG +.\" This defines appropriate quote strings for nroff and troff +.ds lq " +.ds rq " +.if t .ds lq `` +.if t .ds rq '' +.if \nN==0 .nr N 10 +.\" Just in case these number registers aren't set yet... +.if \nD==0 .nr D 5 + +\fIw3m\fP ist ein textorientierter Browser, der lokale oder im Internet +liegende Seiten sowie andere Dokumente anzeigen kann. Er verarbeitet +HTML\-Tabellen und Frames, nicht jedoch JavaScript und Cascading Style +Sheets. \fIw3m\fP kann auch als Textbetrachter (Pager) dienen. Entsprechende +Dateien werden beim Aufruf als Argument angegeben oder an der +Standardeingabe als Datenstrom übernommen. Mit \fIw3m\fP kann sich der Benutzer +überdies durch Verzeichnisbäume bewegen. + +\fIw3m\fP arbeitet mit Reitern (Registerkarten, Tabs) und Puffern, was einen +einfachen Wechsel zwischen geladenen Inhalten erlaubt. Wenn die Erweiterung +w3m\-img installiert ist, zeigt \fIw3m\fP auch in die Seiten eingebundene +Grafiken an. Wann immer die Umsetzung von HTML\-Inhalten durch \fIw3m\fP Ihren +Ansprüchen nicht genügt, reicht ein einzelnes Kommando, um die Ziel\-URL +einem grafischen Browser zu übergeben. + +Um nach Start des Programms Hilfe zu den Optionen zu erhalten, drücken Sie +\(lqH\(rq. + +.SH ARGUMENTE + +Wenn das Programm mit einem oder mehreren Argumenten aufgerufen wird, +behandelt \fIw3m\fP diese Ziele je nach Typ des Inhalts. Bei Daten aus dem +Internet verwertet \fIw3m\fP die Angabe in den HTTP\-Kopfzeilen. Bei relativen +oder absoluten Pfaden in Dateisystemen richtet sich \fIw3m\fP nach dem +Dateinamen. + +Ohne Argument aufgerufen, erwartet \fIw3m\fP unformatierte Daten aus der +Standardeingabe, es sei denn, der Benutzer hat einen anderen MIME\-Typ +angegeben. + +Sollte \fIw3m\fP weder ein Zielobjekt vorliegen noch ein Ausweichen vorgesehen +sein (beispielsweise durch die Option \fB\-v\fP, siehe unten), gibt das Programm +nur Benutzungshinweise aus. +.SH OPTIONEN +Vor Befehlszeilen\-Optionen steht das \(lq\-\(rq Zeichen einzeln, ihnen kann +ein Argument folgen. +.SS "Allgemeine Optionen" +.TP +\fB\-B\fP +starte mit einer Ansicht aller Lesezeichen (wenn kein anderes Zielobjekt +angegeben ist) +.TP +\fB\-M\fP +monochrome Anzeige +.TP +\fB\-no\-mouse\fP +Mausfunktion aus +.TP +\fB\-num\fP +zeige Zeilennummern an +.TP +\fB\-N\fP +verteile die übergebenen Argumente unter Reitern. Standardmäßig würde ein +Stapel von Puffern benutzt +.TP +\fB\-ppc \fP\fInum\fP +Weite von \fInum\fP Bildpunkten pro Zeichen, einstellbar von 4.0 bis 32.0, +standardmäßig 8.0. Größere Werte machen Tabellen enger. (Implementierung +unklar) +.TP +\fB\-ppl \fP\fInum\fP +Höhe von \fInum\fP Bildpunkten pro Linie, einstellbar von 4.0 bis +64.0. (Implementierung unklar) +.TP +\fB\-title\fP, \fB\-title=TERM\fP +verwende den Puffernamen auch als Titel des Terminalfensters. Soweit TERM +eingegeben wurde, konfiguriert dieser Wert den Stil des Titels +.TP +\fB\-v\fP +begrüße den Benutzer mit einer eingebauten Seite (wenn kein anderes +Zielobjekt angegeben ist) +.TP +\fB\-W\fP +wechsle zwischen umlaufendem und nicht umlaufendem Suchen +.TP +\fB\-X\fP +initialisiere nach Verlassen des Programms das Terminal nicht neu +.TP +\fB+\fP\fIZahl\fP +gehe zu Zeile \fIZahl\fP; wirkt nur, wenn \fIZahl\fP größer ist als die im +Terminal verfügbare Zeilenzahl +.SS Browser\-Optionen +.TP +\fB\-cols \fP\fInum\fP +bei für die Standardausgabe bestimmten Inhalten, nimm bei der Umsetzung von +HTML eine Länge von \fInum\fP Zeichen pro Zeile +.TP +\fB\-cookie\fP, \fB\-no\-cookie\fP +verwende gespeicherte Cookies und akzeptiere neue. Oder tue weder das eine +noch das andere +.TP +\fB\-F\fP +verarbeite Frames +.TP +\fB\-graph\fP, \fB\-no\-graph\fP +bei der Umsetzung von Tabellen und Frames grafische Zeichen verwenden oder +nicht verwenden +.TP +\fB\-header \fP\fIZeichenkette\fP +füge \fIZeichenkette\fP der HTTP(S)\-Anfrage an. Diese muss der Kopfdaten\-Syntax +\f(CWVariable: Wert\fP entsprechen +.TP +\fB\-m\fP +stelle eine Usenet\-Nachricht entsprechend \(lqContent\-type\(rq in den +Kopfdaten dar +.TP +\fB\-no\-proxy\fP +verwende keinen Proxy +.TP +\fB\-post \fP\fIDatei\fP +verwende die Methode POST, um in \fIDatei\fP hinterlegte Daten +hochzuladen. Hierbei wird die Syntax \f(CWvar1=wert1[&var2=wert2]…\fP erwartet +.TP +\fB\-4\fP +nur IPv4. Entspricht dns_order=4 in der Konfigurationsdatei +.TP +\fB\-6\fP +nur IPv6. Entspricht dns_order=6 in der Konfigurationsdatei +.SS Textbetrachter\-Optionen +.TP +\fB\-l \fP\fInum\fP +Anzahl der Zeilen, die zwischengespeichert werden, wenn Text per +Standardeingabe übergeben wurde. (Voreinstellung ist 10000) +.TP +\fB\-r\fP +verarbeite spezielle Escape\-Zeichen (beispielsweise ANSI\-Escape\-Zeichen oder +nroff\-Rückwärtsschritte für fette und unterstrichene Zeichen) nicht, sondern +zeige sie stattdessen mittels Caret\-Notation. +.TP +\fB\-s\fP +mehrere leere Zeilen werden bis auf eine gelöscht +.TP +\fB\-t\fP \fInum\fP +berücksichtige Tab\-Zeichen so, dass Spalten mit einer Weite von \fInum\fP +Zeichen entstehen +.SS "Datenart\- und Datenkodierungs\-Optionen" +.TP +\fB\-I \fP\fIcharset\fP +zu benutzende Zeichenkodierung für erhaltene Daten +.TP +\fB\-O \fP\fIcharset\fP +zu benutzende Zeichenkodierung für auszugebende Daten +.TP +\fB\-T \fP\fITyp\fP +zu benutzender MIME\-Typ für erhaltenen Daten +.SS "Optionen zur Datenausgabe, mit sofortigem Verlassen des Programms" +.TP +\fB\-dump\fP +leite die verarbeitete Seite der Standardausgabe zu. Die Option gilt als +gesetzt, wenn der Aufruf beinhaltet, dass die Ausgabe in eine Datei +umgeleitet oder einem weiteren Programm übergeben wird. +.TP +\fB\-dump_source\fP +leite den Seitenquelltext der Standardausgabe zu +.TP +\fB\-dump_head\fP +leite die Antwort einer HEAD\-Anfrage für eine URL der Standardausgabe zu +.TP +\fB\-dump_both\fP +leite Antwort auf HEAD\-Anfrage und Seitenquelltext der Standardausgabe zu +.TP +\fB\-dump_extra\fP +leite Antwort auf HEAD\-Anfrage, Seitenquelltext und Extrainformation der +Standardausgabe zu +.TP +\fB\-help\fP +zeige eine Zusammenfassung verfügbarer Funktionen und Befehlszeilen\-Optionen +.TP +\fB\-show\-option\fP +zeige alle zur Konfiguration verfügbaren Optionen +.TP +\fB\-version\fP +gibt die Version von \fIw3m\fP aus +.SS "Optionen, die Standards für Einstellungen und Datenquellen außer Kraft setzen" +.TP +\fB\-bookmark \fP\fIDatei\fP +benutze anstelle der Standarddatei bookmark.html für Lesezeichen die Datei +\fIDatei\fP +.TP +\fB\-config \fP\fIDatei\fP +benutze \fIDatei\fP anstelle der Standardkonfigurationsdatei +.TP +\fB\-debug\fP +BITTE NICHT BENUTZEN +.TP +\fB\-o \fP\fIOption=Wert\fP +arbeite mit einer Konfiguration, bei der die Einstellung \fIOption\fP mit +\fIWert\fP belegt ist. Ohne \fIOption=Wert\fP gleichwertig mit \fB\-show\-option\fP +.TP +\fB\-reqlog\fP +Protokolliere Header der HTTP\-Kommunikation in Datei \f(CW~/.w3m/request.log\fP +.SH BEISPIELE +.SS "Verwendung als Textbetrachter" +.TP +zwei HTML\-Fragmente zusammengefügt anzeigen +.EX +$ cat header.html footer.html | w3m \-T text/html +.EE +.TP +zwei Dateien unter Reitern einander gegenüberstellen +.EX +$ w3m \-N config.old config +.EE +.SS "browser\-artige Verwendung" +.TP +zeige Internet\-Inhalt in monochromem Terminal +.EX +$ w3m \-M http://w3m.sourceforge.net +.EE +.TP +zeige eingebettete Grafiken an +.EX +$ w3m \-o auto_image=TRUE http://w3m.sourceforge.net +.EE +.TP +zeige Inhalt aus dem Usenet +.EX +$ w3m \-m nntp://news.aioe.org/comp.os.linux.networking +.EE +.TP +mit der POST\-Methode Daten für eine URL hochladen +.EX +$ w3m \-post \- http://example.com/form.php <<<'a=0&b=1' +.EE +.SS "filterartige Verwendung" +.TP +konvertiere eine HTML\-Datei in reinen Text von bestimmter Zeilenlänge +.EX +$ w3m \-cols 40 foo.html > foo.txt +.EE +.TP +übergib den Bestand an Lesezeichen mit zugehörigen Links als reinen Text einer Datei. +.EX +$ w3m \-B \-o display_link_number=1 > out.txt +.EE +.TP +Konvertierung in ein anderes Dateiformat und eine andere Zeichenkodierung +.EX +$ w3m \-T text/html \-I EUC\-JP \-O UTF\-8 < foo.html > foo.txt +.EE +.SS "starte ohne Eingabedaten" +.TP +begrüße den Benutzer mit einer eingebauten Seite +.EX +$ w3m \-v +.EE +.\".SH Errors +.SH UMGEBUNGSVARIABLEN +\fIw3m\fP weicht auf den Wert der Umgebungsvariablen WWW_HOME aus, wenn das +Programm ohne Zielobjekt aufgerufen wurde. +.SH DATEIEN +.TP +\f(CW~/.w3m/bookmark.html\fP +voreingestellte Datei für Lesezeichen +.TP +\f(CW~/.w3m/config\fP +benutzerdefinierte Konfigurationsdatei; gegenüber \f(CW/etc/w3m/config\fP +vorrangig +.TP +\f(CW~/.w3m/cookie\fP +Ablageort für Cookies; wird beim Verlassen des Programms geschrieben und +beim Aufruf gelesen +.TP +\f(CW~/.w3m/history\fP +Chronik besuchter Seiten und URLs +.TP +\f(CW~/.w3m/keymap\fP +benutzerdefinierte Tastaturbelegung, setzt standardmäßige Belegung außer +Kraft +.TP +\f(CW~/.w3m/mailcap\fP +Konfigurationsdatei für Programme zur externen Anzeige +.TP +\f(CW~/.w3m/menu\fP +benutzerdefiniertes Menü; vorrangig gegenüber Standardmenü +.TP +\f(CW~/.w3m/mime.types\fP +Datei mit MIME\-Typen +.TP +\f(CW~/.w3m/mouse\fP +benutzerdefinierte Mauseinstellungen +.TP +\f(CW~/.w3m/passwd\fP +Datei mit Nutzerkonto\-Passwort\-Liste +.TP +\f(CW~/.w3m/pre_form\fP +.\" .TP +.\" .I $~/.w3m/urimethodmap +.\" ??? +enthält vordefinierte Werte für wiederkehrende HTML\-Formulare +.SH "SIEHE AUCH" +README und Beispieldateien finden Sie im Dokumentationsverzeichnis Ihrer +\fIw3m\fP\-Installation. Aktuelle Informationen zu \fIw3m\fP finden Sie auf der +Projektseite +.UR http://w3m.sourceforge.net +unter +.UE +.SH DANKSAGUNGEN +In \fIw3m\fP ist Programmcode verschiedener Quellen eingeflossen. Benutzer +haben mit Korrekturen (Patch\-Dateien) und Vorschlägen zur Verbesserung des +Programms beigetragen. +.SH AUTOR +.UR aito@fw.ipsj.or.jp +Akinori ITO +.UE +Die deutsche Übersetzung wurde 2016 von +.UR markus.hiereth@freenet.de +Markus Hiereth +.UE +erstellt. + diff --git a/doc-jp/FAQ.html b/doc-jp/FAQ.html index e16a986..86ef05a 100644 --- a/doc-jp/FAQ.html +++ b/doc-jp/FAQ.html @@ -176,7 +176,7 @@ w3m ¸ޤ¸ ESC I Ǥ

    ץϤɤΡ -
    Ķѿ HTTP_proxy ꤹ뤫"o" ޥɤΥץѥͥ +
    Ķѿ HTTP_PROXY, HTTPS_PROXY, GOPHER_PROXY, FTP_PROXY ꤹ뤫"o" ޥɤΥץѥͥ ꤷޤ㤨 proxy.hogege.com ȤۥȤ 8000֥ݡȤ Ѥ硤

    diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html index 41d70f1..66fdc6e 100644 --- a/doc-jp/MANUAL.html +++ b/doc-jp/MANUAL.html @@ -51,15 +51,9 @@ w3m

    -l Կ
    ɸϤƤɽȤ¸Կꤹ 롥ǥեȤ 10000 -
    -s -
    Shift_JIS ɤɽ롥 -
    -e -
    EUC ɤɽ롥 -
    -j -
    JIS(ISO-2022-JP) ɤɽ롥 -
    -O e|s|j|N|m|n +
    -O ʸ
    ɽѤʸɤꤹ롥 -
    -I e|s +
    -I ʸ
    ʸʸɤꤹ롥
    -T
    ɽʸΥפꤹ롥λ꤬ʤ硤ե @@ -89,7 +83,7 @@ HTML
    顼ɽ򤷤ʤ
    -F
    ե졼ưɽ롥 -
    -S +
    -s
    Ϣ³Ԥ1ԤˤޤȤɽ롥
    -X
    w3mλˡβ̤ʤ @@ -211,9 +205,9 @@ HTMLʸ F<FRAMESET>ޤʸɽƤȤˡ<FRAME> λؤʣʸ1ĤʸѴɽޤ M߸Ƥڡ򡤳֥饦Ȥäɽޤ -2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ +2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ ESC MߤΥ򡤳֥饦Ȥäɽޤ -2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ +2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ

    եURLط

    @@ -349,9 +343,9 @@ Lynx F<FRAMESET>ޤʸɽƤȤˡ<FRAME> λؤʣʸ1ĤʸѴɽޤ M߸Ƥڡ򡤳֥饦Ȥäɽޤ -2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ +2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ ESC MߤΥ򡤳֥饦Ȥäɽޤ -2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ +2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ

    եURLط

    @@ -489,8 +483,7 @@ w3m w3mȤСHTTPФʤCGIץȤư뤳ȤǤޤ ΤȤw3mФΤդ򤷤ƥץȤưνϤ ɤߤɽ櫓Ǥ -֥åޡϿ -ӥ塼Խ +֥åޡϿȳӥ塼Խ ϡlocal CGIΥץȤȤƼ¸Ƥޤ local CGIȤСw3mѤΥեϥ󥿥եȤ ȤȤǤޤ diff --git a/doc-jp/README b/doc-jp/README index 074766f..e5e59b1 100644 --- a/doc-jp/README +++ b/doc-jp/README @@ -122,7 +122,6 @@ w3m ± satodai@w3m.jp -ոۤMLޤǤ󤻤 - w3m-dev@sic.med.tohoku.ac.jp (ܸ) - w3m-dev-en@sic.med.tohoku.ac.jp (Ѹ) +ոۤ򤪴󤻤 http://w3m.sourceforge.net/ + https://sourceforge.net/projects/w3m/ diff --git a/doc-jp/README.SSL b/doc-jp/README.SSL index 4aedfde..ae22001 100644 --- a/doc-jp/README.SSL +++ b/doc-jp/README.SSL @@ -24,10 +24,11 @@ SSL SSL ˴ؤưʲ꤬ǽˤʤäƤޤ: ssl_forbid_method - ȤʤSSL᥽åɤΥꥹ(2: SSLv2, 3: SSLv3, t: TLSv1) - (ǥեȤ). + ȤʤSSL᥽åɤΥꥹ(2: SSLv2, 3: SSLv3, t: TLSv1.0, + 5: TLSv1.1, 6: TLSv1.2, 7: TLSv1.3) + (ǥեȤ2, 3). ssl_verify_server ON/OFF - SSLΥǧڤԤ(ǥեȤOFF). + SSLΥǧڤԤ(ǥեȤON). ssl_cert_file ե̾ SSLΥ饤PEMե(ǥեȤ). ssl_key_file ե̾ @@ -85,6 +86,9 @@ SSL # # certdata2pem.rb +if RUBY_VERSION>="1.9" + Encoding.default_external="UTF-8" +end while line = $stdin.gets next if line =~ /^#/ next if line =~ /^\s*$/ diff --git a/doc-jp/README.func b/doc-jp/README.func index 542aaa9..750d3d7 100644 --- a/doc-jp/README.func +++ b/doc-jp/README.func @@ -1,7 +1,7 @@ ABORT ǧw3mλޤ ACCESSKEY Accesskey ˥塼Ω夲ޤ -ALARM 顼ꤷޤ ADD_BOOKMARK ߸Ƥڡ֥åޡɲäޤ +ALARM 顼ꤷޤ BACK ΥХåեɽޤ BEGIN ʸΤФιԤ˰ưޤ BOOKMARK ֥åޡɤ߹ߤޤ @@ -30,13 +30,13 @@ EXTERN EXTERN_LINK ߤΥ򡤳֥饦Ȥäɽޤ FRAME λؤʸ1ĤʸѴɽޤ GOTO URLꤷƳޤ +GOTO_HOME ۡڡޤ(ĶѿHTTP_HOMEޤWWW_HOMEǻ) GOTO_LINE ̲ǹֹϤǻꤷԤ˰ưޤ GOTO_LINK 󥯤ؤʸɤߤߤޤ GOTO_RELATIVE URLꤷƳޤ HELP إץեɽޤ HISTORY URLɽޤ INFO ߤʸ˴ؤɽޤ -INIT_MAILCAP mailcap ɤ߹ߤޤ( local-CGI ) INTERRUPT ʸɤ߹ߤǤޤ ISEARCH եˤफäƥ󥯥󥿥륵ޤ ISEARCH_BACK եƬˤफäƥ󥯥󥿥륵ޤ @@ -72,6 +72,7 @@ MSGS NEW_TAB ֤򳫤ޤ NEXT ΥХåեɽޤ NEXT_DOWN β¦ˤ󥯤˰ưޤ +NEXT_HALF_PAGE Ⱦڡ˥뤷ޤ NEXT_LEFT κ¦ˤ󥯤˰ưޤ NEXT_LEFT_UP κ¦(̵ι԰)ˤ󥯤˰ưޤ NEXT_LINK Υ󥯤˰ưޤ @@ -92,6 +93,7 @@ PEEK_LINK PIPE_BUF ХåեƤѥפϤޤ PIPE_SHELL ޥɤ¹Ԥ̤ɤߤߤʤɽޤ PREV ΥХåեɽޤ +PREV_HALF_PAGE Ⱦڡ˥뤷ޤ PREV_LINK Υ󥯤˰ưޤ PREV_MARK Υޡ˰ưޤ PREV_PAGE Υڡɽޤ diff --git a/doc-jp/README.siteconf b/doc-jp/README.siteconf new file mode 100644 index 0000000..c7617b3 --- /dev/null +++ b/doc-jp/README.siteconf @@ -0,0 +1,67 @@ +siteconf: ̥ޥ + +siteconf ϡ URL Υѥȡɳդ줿꤫ޤ +siteconf Ȥȡʸɤꤷ "decode_url" +νϤꡢ Google Υ쥯򱪲󤷤ǽ +ץ饤Х夵ꤹ뤳ȤǤޤ + +ǥեȤǤ siteconf ~/.w3m/siteconf ɤ߹ޤޤ + +===== ʸ ===== + +url |//|m@@i [exact] +substitute_url "" +url_charset +no_referer_from on|off +no_referer_to on|off +user_agent "string" + +˽񤫤줿Τͥ褵ޤ + +===== ===== + +url "https://twitter.com/" +substitute_url "https://mobile.twitter.com/" + +twitter.com Х륵Ȥžޤ + +url "http://your.bookmark.net/" +no_referer_from on + +your.bookmark.net ĥä󥯤éݤˡ HTTP referer +ʤ褦ˤޤ + +url "http://www.google.com/url?" exact +substitute_url "file:///cgi-bin/your-redirector.cgi?" + +Google Υ쥯 local CGI žޤ + +url /^http:\/\/[a-z]*\.wikipedia\.org\// +url_charset utf-8 + +Ʊ "decode_url" ץ򥪥ˤȡ Wikipedia ؤ +󥯤 UTF-8 Ȥƥǥɤɽޤ + +url m@^https?://(.*\.)google\.com/@ +user_agent "Lynx/2.8.8dev.3 libwww-FM/2.14 SSL-MM/1.4.1" + +Google Lynx Ǥȹ𤲤ޤ(ˤƥȥ֥饦ڡ +֤ޤ) + +===== ɽˤĤ ===== + +ɽϤƱ̣ɽޤ + +/http:\/\/www\.example\.com\// +m/http:\/\/www\.example\.com\// +m@http://www\.example\.com/@ +m!http://www\.example\.com/! + +Ǹ 'i' Ҥդȡʸʸ̤˾ȹԤޤ +㤨С m@^http://www\.example\.com/abc/@i ϰʲΤȤפޤ + +http://www.example.com/abc/ +http://www.example.com/Abc/ +http://www.example.com/ABC/ + +ۥ̾ʬϾ˾ʸѴƤӤޤ diff --git a/doc-jp/README.tab b/doc-jp/README.tab index 61f7c58..99a1220 100644 --- a/doc-jp/README.tab +++ b/doc-jp/README.tab @@ -38,6 +38,6 @@ w3m $B$r%?%V%V%i%&%62=(B open_tab_blank $B!D(B target $B$,(B _blank $B$+(B _new $B$N>l9g$O?7$7$$%?%V$G3+$/(B $B%G%U%)%k%H$O(B OFF close_tab_back $B!D(B $BLa$k;~$K%P%C%U%!$,:G8e$J$i%?%V$rJD$8$k(B - $B%G%U%)%k%H$O(B OFF (= Can't back...) + $B%G%U%)%k%H$O(B OFF (= Can't go back...) $B$rDI2C$7$F$$$^$9!#(B diff --git a/doc-jp/keymap.default b/doc-jp/keymap.default index 0ecf14f..174e4ed 100644 --- a/doc-jp/keymap.default +++ b/doc-jp/keymap.default @@ -11,6 +11,7 @@ # Left : LEFT, ^[[D keymap C-@ MARK +keymap C-_ GOTO_HOME keymap C-a LINE_BEGIN keymap C-b MOVE_LEFT keymap C-e LINE_END diff --git a/doc-jp/keymap.lynx b/doc-jp/keymap.lynx index 869c716..e4085c8 100644 --- a/doc-jp/keymap.lynx +++ b/doc-jp/keymap.lynx @@ -46,7 +46,7 @@ keymap - PREV_PAGE keymap . RIGHT keymap / SEARCH keymap : MARK_URL -keymap ; MARK_WORD +keymap ";" MARK_WORD keymap < SHIFT_LEFT keymap = INFO keymap > SHIFT_RIGHT diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1 index 89aacb6..a54e078 100644 --- a/doc-jp/w3m.1 +++ b/doc-jp/w3m.1 @@ -1,5 +1,5 @@ .\" -.TH W3M 1 "Jun 6 2000" "UNIX" +.TH W3M 1 "2016-04-02" "w3m 0.5.3" .SH NAME .B w3m \- text base pager/WWW browser @@ -39,19 +39,10 @@ text/plain ɸϤƤɽȤ¸Կꤹ롥 ǥեȤ10000 .TP -.B \-s -Shift_JISɤɽ롥 -.TP -.B \-e -EUCɤɽ롥 -.TP -.B \-j -JIS (ISO-2022-JP)ɤɽ롥 -.TP -.BI \-O\ e|s|j|N|m +.BI \-O\ ʸ ɽ˻Ȥʸɤꤹ. .TP -.BI \-I\ e|s +.BI \-I\ ʸ ʸʸɤꤹ롥 .TP .BI \-T\ @@ -90,7 +81,7 @@ Bookmark .B \-F ե졼ưɽ롥 .TP -.B \-S +.B \-s Ϣ³Ԥ1ԤˤޤȤɽ롥 .TP .B \-X @@ -327,13 +318,13 @@ URL .TP .B M ߸Ƥڡ򡤳֥饦Ȥäɽޤ -.B 2M, 3M -2ܤ3ܤΥ֥饦Ȥޤ +.B 2M, 3M, ..., 9M +2ܡ3ܡ9ܤΥ֥饦Ȥޤ .TP .B "ESC M" ߤΥ򡤳֥饦Ȥäɽޤ -.B "2ESC M", "3ESC M" -2ܤ3ܤΥ֥饦Ȥޤ +.B "2ESC M", "3ESC M", ..., "9ESC M" +2ܡ3ܡ9ܤΥ֥饦Ȥޤ .SS եURLط .TP .B U diff --git a/doc/FAQ.html b/doc/FAQ.html index ed2a704..ca82c67 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -1,291 +1,763 @@ - - -W3M FAQ - - -

      -

    Frequently Asked Questions and Answers about w3m

    -
    -Akinori Ito
    -aito@fw.ipsj.or.jp
    -Corrected by Tom Berger <tom.be@gmx.net> -
    -

    -

    Index
    -

    -
    -

      -

    • General Questions, How to Get It, Required Environment

      • -
        -

      • How do I pronounce "w3m"?

        -

      • Why is it called "w3m"?

        -

      • On which platforms does w3m work?

        -

      • Where can I get more information about w3m?

        -

      • Is there a mailing list for w3m?

        -

      • Are there any binary distributions?

        -
      -
      -

    • Compile and Install

       -
      -

    • Options, Commands, Usage

       -
        -

      • w3m quits if started without parameters. What's wrong?

        -

      • w3m starts with black characters on a black screen. How do I change this?

        -

      • Does w3m support colours?

        -

      • Does w3m support monochrome display?

        -

      • How do I shift the display?

        -

      • How do I move from anchor to anchor?

        -

      • Netscape displays a word red, but w3m doesn't. Why?

        -

      • How do I change the colour of anchor-/image-/form links?

        -

      • w3m doesn't seem to use the variable EDITOR. Why?

        -

      • How do I quit a search or URL text input?

        -
      -
      -

    • Questions about WWW usage

       -
        -

      • How do I fill in forms with w3m?

        -

      • Seems like w3m is slower than Netscape or Lynx. Why?

        -

      • Loading time doesn't decrease when loading a previously seen page

        -

      • How do I download a linked file?

        -

      • How do I specify a proxy server?

        -

      • w3m freezes when I invoke an external browser.

        -

      • How do I change the default image viewer?

        -

      • How do I enter a URL?

        -

      • w3m appends a URL to the former one despite of having cleared the line with Ctrl-u. What to do?

        -
      -
      -

    • Misc

      -
        -

      • What is w3m's configuration file?

        -

      • What are these w3mxxxx files in my ~/.w3m directory for?

        -
      -
        -
      -

      General Questions, How to Get It, Required Environment

       -
      -
      -

      How do I pronounce "w3m"?

      -
      It's "W-three-M". It doesn't rhyme with "pteranodon". -

      -

      Why is it called "w3m"?

      -
      It's an abbreviation of "WWW-wo-Miru", which is Japanese for -"See the WWW". So in English the name of this browser would be -something like "stw3". -

      -

      On which platforms does w3m work?

      -
      It runs on various versions of Unix, since version 990226 on OS/2 and since -version 990303 also on MS-Windows with Cygwin32. -
      -Current versions have been confirmed to run on: -
        -
      • SunOS 4.1.x -
      • HP-UX 9.x, 10.x -
      • Solaris 2.5.x, 2.6, 8 -
      • Linux 2.0.30 -
      • FreeBSD 2.2.8, 3.1, 3.2, 4.6 -
      • NetBSD/macppc, m68k -
      • EWS4800 Rel.12.2 Rev.A -
      • Digital UNIX: v3.2D, v4.0D -
      • IRIX 5.3, IRIX 6.5 -
      • OS/2 with emx -
      • Windows 9x/NT with Cygwin32 b20.1 -
      • MS-DOS with DJGPP and WATT32 packet driver -
      • MacOS X Server -
      • MacOS X 10.1, 10.2 -
      -

      Where can I get more information about w3m?

      -
      At the English w3m home page. -

      Is there a mailing list for w3m?

      -
      There is a mailing list for developpers (w3m-dev-en). Please see -w3m page -for details. You may also mail your comments to the author. -

      Are there any binary distributions?

      -
      So far there are only binaries for the win/cygnus32 version. You can get -them from here. -Contact the author if you want to contribute binaries for other platforms. -
      -
      -
      -
      -Up to index -
      -
      -

      Compile and Install

       -No problem :-) -

      Options, Commands, Usage

       -
      -
      -

      w3m quits if started without parameters. What's wrong?

      -
      w3m is a pager. Therefore it just quits when invoked without any -arguments. Possible arguments are: -
        -
      1. A filename or an URL -
      2. Pipe from standard input -
      3. The -B option (Show bookmark file) -
      4. The -v option (visual startup) -
      5. From a specified HTTP_HOME or WWW_HOME variable -
      -

      -

      w3m starts with black characters on black background. How do I change -this?

      -
      -When compiled with colour support, w3m assumes a white background and therefore -displays black characters. -
      -You may either change the background colour of your terminal (e.g. with the -bg -option in a xterm) or take these steps: -
        -
      • invoke w3m with 'w3m -M' (for monochrome), -
      • type 'o' for getting to the options screen -
      • Mark 'Display with colour' as ON and choose an arbitrary colour. -Click on [OK]. -
      -

      -

      Does w3m support colours?

      -
      Yes. When you run './configure', answer the question -

      + + + + + + W3M FAQ + + +

      + Frequently Asked Questions and Answers about w3m +

      +

      + Akinori Ito <aito@fw.ipsj.or.jp>
      + Corrected by Tom Berger <tom.be@gmx.net> +

      +

      + + Index + +

      +
        +
      • + + + General Questions, How to Get It, Required Environment + + +
        • +
          +
        • + + How do I pronounce w3m? + +
          • +
        • + + Why is it called w3m? + +
          • +
        • + + On which platforms does w3m work? + +
          • +
        • + + Where can I get more information about w3m? + +
          • +
        • + + Is there a mailing list for w3m? + +
          • +
        • + + Are there any binary distributions? + +
          • +
        +
      • + + + Compile and Install + + +
        • +
      • + + + Options, Commands, Usage + + +
        • +
          +
        • + + w3m quits if started without parameters. What's wrong? + +
          • +
        • + + w3m starts with black characters on a black background. How do + I change this? + +
          • +
        • + + Does w3m support colors? + +
          • +
        • + + Does w3m support monochrome displays? + +
          • +
        • + + How do I shift the display? + +
          • +
        • + + How do I move between hyperlinks? + +
          • +
        • + + Graphical browsers display a word red, but w3m doesn't. Why? + +
          • +
        • + + How do I change the colors for hyperlinks, images and form fields? + +
          • +
        • + + w3m doesn't seem to use the variable EDITOR. Why? + +
          • +
        • + + How do I quit a search or URL text input? + +
          • +
        +
      • + + + Questions about WWW usage + + +
        • +
          +
        • + + How do I fill in forms with w3m? + +
          • +
        • + + Seems like w3m is slower than some other browsers. Why? + +
          • +
        • + + Loading time doesn't decrease when loading a previously seen + page. + +
          • +
        • + + How do I download a linked file? + +
          • +
        • + + How do I specify a proxy server? + +
          • + +
        • + + How do I change the default image viewer? + +
          • +
        • + + How do I enter a URL? + +
          • +
        • + + w3m appends a URL to the former one even when I clear the line + with CTRL-u. What should I do? + +
          • +
        +
      • + + + Miscellaneous + + +
        • +
          +
        • + + What is w3m's configuration file? + +
          • +
        • + + What are these w3mxxxx files in my ~/.w3m directory for? + +
          • +
        +
      +

      + + General Questions, How to Get It, Required Environment + +

      +
      +
      + + How do I pronounce w3m? + +
      +
      +

      + It's W-three-M. It doesn't rhyme with pteranodon. +

      +
      +
      + + Why is it called w3m? + +
      +
      +

      + It's an abbreviation of WWW-wo-Miru, which is Japanese + for See the WWW. So in English the name of this browser + would be something like stw3. +

      +
      +
      + + On which platforms does w3m work? + +
      +
      +

      + It runs on various versions of Unix, since version 990226 on OS/2 + and since version 990303 also on MS-Windows with Cygwin32. +

      +

      + More recent versions have been confirmed to run on: +

      +
        +
      • + SunOS 4.1.x +
        • +
      • + HP-UX 9.x, 10.x +
        • +
      • + Solaris 2.5.x, 2.6, 8 +
        • +
      • + Linux 2.0.1 to 3.17 +
        • +
      • + FreeBSD 2.2.8, 3.1, 3.2, 4.6 +
        • +
      • + NetBSD/macppc, m68k +
        • +
      • + EWS4800 Rel.12.2 Rev.A +
        • +
      • + Digital UNIX: v3.2D, v4.0D +
        • +
      • + IRIX 5.3, IRIX 6.5 +
        • +
      • + OS/2 with emx +
        • +
      • + Windows 9x/NT with Cygwin32 b20.1 +
        • +
      • + MS-DOS with DJGPP and WATT32 packet driver +
        • +
      • + MacOS X Server +
        • +
      • + MacOS X 10.1, 10.2 +
        • +
      +
      +
      + + Where can I get more information about w3m? + +
      +
      +

      + At the + English w3m + home page. +

      +
      +
      + + Is there a mailing list for w3m? + +
      +
      +

      + There is a mailing list for developers (w3m-dev-en). Please see + the w3m home + page for details. You may also mail your comments to + the author. +

      +
      +
      + + Are there any binary distributions? + +
      +
      +

      + So far there are only binaries for the win/cygnus32 version. + + Contact the author if you + want to contribute binaries for other platforms. +

      +
      +
      +

      + + Up to index + +

      +

      + + Compile and Install + +

      +

      + No problem :-) +

      +

      + + Options, Commands, Usage + +

      +
      +
      + + w3m quits if started without parameters. What's wrong? + +
      +
      +

      + w3m is a pager. Therefore it just quits when invoked + without any arguments. It keeps running +

      +
        +
      • + with a filename or URL as argument +
        • +
      • + with data piped from standard input +
        • +
      • + when invoked with option -B to show the bookmark file +
        • +
      • + when invoked with option -v to welcome users with a built-in page +
        • +
      • + with specified HTTP_HOME or WWW_HOME variable +
        • +
      +
      +
      + + w3m starts with black characters on a black background. How do I + change this? + +
      +
      +

      + When compiled with color support, w3m assumes a white background + and therefore displays black characters. +

      +

      + You may either change the background color of your terminal + (e.g. with the -bg option in a xterm) or take these steps +

      +
        +
      1. + invoke monochrome mode of w3m with w3m -M +
        2. +
      2. + type o to get to the options setting panel +
        3. +
      3. + mark Display with color as YES and choose an + arbitrary color +
        4. +
      4. + click on [OK]. +
        5. +
      +
      +
      + + Does w3m support colors? + +
      +
      +

      + Yes. When you run ./configure, answer the question + 

      -Let's do some configurations. Choose config option among the list."
+  Let's do some configurations. Choose config option among the list.
 
-1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-5 - Monster model (with everything; you need openSSL library)
-6 - Customize
-Which? 
+  1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
+  2 - Little model  (color, menu, no mouse, no cookie, no SSL)
+  3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
+  4 - Cookie model  (color, menu, mouse, cookie, no SSL)
+  5 - Monster model (with everything; you need openSSL library)
+  6 - Customize
+  Which?
      -

      -with 2,3,4 or 5. -

      -

      Does w3m support monochrome display?

      -
      Yes. You may either -
        -
      1. Answer the above mentioned 'configure' question with 1, or -
      2. Invoke w3m with the -M option, or -
      3. Type 'o' within w3m to enter the options screen and turn off colour display -mode. -
      -

      How do I shift the display?

      -
      You can shift the display by moving the cursor to the edge of the screen. You -may also use the ">"/"<" or "."/"," keys. -
      -Another idea would be adjusting the xterm with the -geometry option (e.g. -something like 'xterm -geometry 110x45 -bg white -name w3m -e w3m -B'). -

      How do I move from anchor to anchor?

      -
      You can move to the next anchor using TAB. ESC TAB moves cursor to the previous anchor. -

      -

      Netscape displays a word red, but w3m doesn't. Why?

      -
      w3m doesn't support <FONT COLOR=".."> tags. It won't be impossible to implement this, but I think it would make the document more difficult to read. -

      -

      How do I change the colour of anchor-/image-/form links?

      -
      Type 'o' within w3m to get the 'options' screen. You can change these -settings there. -
      -

      w3m doesn't seem to use the variable EDITOR. Why?

      -
      Go to the 'options' screen using the "o" key. Any entry in the 'Editor' field will override the environment variable. -
      -If you want to use the editor specified by EDITOR blank the field and push [OK]. -

      -

      How do I quit a search or URL text input?

      -
      Clear input text using Ctrl-u and hit RETURN. -
      -
      -
      -
      -Up to index -
      -
      -

      Questions about WWW usage

       -
      -
      -

      How do I fill in forms with w3m?

      -
      Form input fields are displayed in red (or reverse). Move the cursor to -them and hit RETURN. Then, -
        -
      • if it is a text input field, put in your text on the bottom line, -
      • if it is a radiobutton or checkbox, that item is selected, -
      • if it is a textarea, an editor is spawned, -
      • if it is 'submit' or 'reset', well, just do it. -
      -

      Seems like w3m is slower than Netscape or Lynx. Why?

      -
      w3m renders a HTML document in two passes. Therefore it displays the documentnot before having read the entire document. -
      -Netscape or Lynx display the document before having read the whole page, -and therefore seem faster. -

      -

      Loading time doesn't decrease when loading a previously seen page

      -
      w3m doesn't have its own cache. Therefore, it reads the document -from the server each time it accesses it. If possible, use a cache server. -

      -

      How do I download a linked file?

      -
      Use 'a' (or 'd' with Lynx-like keybindings) or ESC RET. If you want to download an inline image, use ESC 'I'. -

      -

      How do I specify a proxy server?

      -
      Set the environment variable HTTP_PROXY or use the option setting panel -("o" key). For example, if you want to use port 8000 of proxy.hogege.com, specify -

      -

      -    http://proxy.hogege.com:8000/
-
      -

      -

      w3m freezes when I invoke an external browser.

      -
      Enter w3m's option screen using the 'o' key and specify -

      -

      -    netscape %s &
-
      -

      -(if you are using netscape). -

      -

      How do I change the default image viewer?

      -
      By default w3m uses xv to view images. If you want to change it into, let's say, 'display', add the following line to ~/.w3m/mailcap or /etc/mailcap. -

      +

      + with 2, 3, 4, or 5. +

      +
      +
      + + Does w3m support monochrome displays? + +
      +
      +

      + Yes. You may either +

      +
        +
      • + Answer the above-mentioned configure question with 1, + or +
        • +
      • + Invoke w3m with the -M option, or +
        • +
      • + Type o within w3m to enter the options setting panel and turn + off color display mode. +
        • +
      +
      +
      + + How do I shift the display? + +
      +
      +

      + You can shift the display by moving the cursor to the edge of + the screen. You may also use the following commands +

      +
        +
      • SHIFT_LEFT and SHIFT_RIGHT, bound to the keys > and <
        • +
      • SHIFT_LEFT1 and SHIFT_RIGHT1, bound to the keys . and ,
        • +
      +

      + Another idea would be adjusting the xterm with the -geometry + option e.g. something like +

      + 
        xterm -geometry 110x45 -bg white -name w3m -e w3m -B
      +
      +
      + + How do I move between hyperlinks? + +
      +
      +

      + + You can move to the next hyperlink + using TAB. ESC + TAB moves the cursor to the previous hyperlink. (see + Section + Functions and Key bindings of w3m's manual) + +

      +
      +
      + + Graphical browsers display a word red, but w3m doesn't. Why? + +
      +
      +

      + w3m doesn't support the attribute COLOR="..." of HTML. It wouldn't + be impossible to implement this, but I think it would make + documents more difficult to read. +

      +
      +
      + + How do I change the colors for hyperlinks, images and form fields? + +
      +
      +

      + Type o within w3m to get the options panel. You + can change these settings there. +

      +
      +
      + + w3m doesn't seem to use the variable EDITOR. Why? + +
      +
      +

      + Go to the options setting panel using the o key. Any + entry in the Editor field overrides the environment + variable. +

      +

      + If you want to use the editor specified by EDITOR, blank the + field and save the settings using the button [OK]. +

      +
      +
      + + How do I quit a search or URL text input? + +
      +
      +

      + Clear input text using CTRL-u and hit RETURN. +

      +
      +
      +

      + + Up to index + +

      +

      + + Questions about WWW usage + +

      +
      +
      + + How do I fill in forms with w3m? + +
      +
      +

      + Form input fields are displayed in red (or reverse). Move the + cursor to them. Then, if it is +

      +
        +
      • + a text input field, hit RETURN + put in your text on the bottom line. Press + RETURN again +
        • +
      • + a radiobutton or checkbox, pressing + RETURN changes or toggles the selection +
        • +
      • + a textarea, pressing + RETURN spawns an editor +
        • +
      • + a submit or reset field, + the respective action is performed. +
        • +
      +
      +
      + + Seems like w3m is slower than some other browsers. Why? + +
      +
      +

      + w3m renders a HTML document in two passes. Therefore it doesn't + start to display the document until it has finished reading it. +

      +

      + Most other browsers display the document before having read the + whole page, and therefore seem faster. +

      +
      +
      + + Loading time doesn't decrease when loading a previously seen + page. + +
      +
      +

      + w3m doesn't have its own cache. Therefore, it reads the document + from the server each time it accesses it. If possible, use a + cache server. +

      +
      +
      + + How do I download a linked file? + +
      +
      +

      + Use a (or d with Lynx-like keybindings) or + ESC RET. + If you want to download an inline image, use + ESC I. (see + Section + Functions and Key bindings of w3m's manual) +

      +
      +
      + + How do I specify a proxy server? + +
      +
      +

      + Set the environment variables HTTP_PROXY, HTTPS_PROXY, GOPHER_PROXY + and FTP_PROXY, or use the options setting panel (o key). For + example, if you want to use port 8000 of proxy.example.org, specify +

      + 
        http://proxy.example.org:8000/
      +
      + +
      + + How do I change the default image viewer? + +
      +
      +

      + By default w3m uses xv to view images. If you want to change it + into, let's say, display, add the following line to + ~/.w3m/mailcap or /etc/mailcap: + 

      -image/*; display %s
+  image/*; display %s
      -

      -You can specify external viewers of other file types as well: -

      +

      + You can specify external viewers of other file types as well: + 

      -image/*;                     display %s
-application/postscript;      ghostview %s
-application/x-dvi;           xdvi %s
+  image/*;                     display %s
+  application/postscript;      ghostview %s
+  application/x-dvi;           xdvi %s
      -

      How do I enter a URL?

      -
      Type SHIFT-U -

      -

      w3m appends a URL to the former one despite of having cleared the line -with Ctrl-u. What to do?

      -
      Enter the complete adress, e.g. http://www.slashdot.org. -
      -
      -
      -
      -Up to index -
      -
      -

      Miscellaneous

       -
      -
      -

      What is w3m's configuration file?

      -
      It is ~/.w3m/config. -With this file, you can adjust w3m's behavior by changing values of options -that are described to be varied with the option setting panel. -Each line contains setting for one option, which is a pair of an option name -and its value with a space as a separator. -

      -

      What are these w3mxxxx files in my ~/.w3m directory for?

      -
      These are temporary files used by w3m when reading documents from a -WWW server. They are not cache files and are usually deleted when w3m is -terminated. If there remain any temp files, please remove them by yourself. -

      -

      -
      -
      -
      -Up to index -
      -
      - - +
      +
      + + How do I enter a URL? + +
      +
      +

      + Type U +

      +
      +
      + + w3m appends a URL to the former one even when I clear the line + with CTRL-u. What should I do? + +
      +
      +

      + Enter the complete address, e.g. http://www.slashdot.org. +

      +
      +
      +

      + + Up to index + +

      +

      + + Miscellaneous + +

      +
      +
      + + What is w3m's configuration file? + +
      +
      +

      + It is ~/.w3m/config. +

      + +

      + With this file, each user can adjust w3m's behavior by changing + the values of options whose effects are described in the options + setting panel. Each line contains one option setting, consisting + of an option name and its value with a space as a separator. +

      + +

      Without a user-specific configuration file, w3m honours + the system wide configuration file /etc/w3m/config. +

      + +
      +
      + + What are these w3mxxxx files in my ~/.w3m directory for? + +
      +
      +

      + These are temporary files used by w3m when reading documents + from a WWW server. They are not cache files and are usually + deleted when w3m is terminated. If any temp files are left + behind, please remove them yourself. +

      +
      +
      +

      + + Up to index + +

      + + diff --git a/doc/HISTORY b/doc/HISTORY index b8f5b94..7f7ae2b 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -588,7 +588,7 @@ From: Okabe Katsuya * space characters in a buffer are mapped into 0x80-0x9f. * unprintable characters (0x80-0xa0) are displayed as \xxx. -From: Tsutomu Okada ($B2,ED(B $BJY(B) +From: Tsutomu Okada Subject: [w3m-dev 01354] minimize when #undef USE_GOPHER or USE_NNTP 2000/11/16 @@ -1422,7 +1422,7 @@ HTML4.0 ID attribute support. From: Okabe Katsuya table get weird when it contains . -$B=$@5!%(B +Fixed. 2000.2.12 From: Rogue Metal - Jake Moorman @@ -1649,15 +1649,15 @@ From: patakuti If an tag has no `name' attribute, w3m adds it an inappropriate name attribute. -From: $B$d$^(B +From: Yama Now w3m can handle a frameset that has both ROWS and COLS. From: aito Now bookmarking is done by a separate command w3mbookmark. -C-s $B$G2hLLI=<($,;_$^$C$F$$$?%P%0$N=$@5!%(B +Bug fix that C-s hangs. -$BJ8;zF~NO;~$K(B C-g $B$GCf;_$G$-$k$h$&$K$7$?!%(B +Enable C-g to quit for keyboard input. From: hovav@cs.stanford.edu When downloading a file, an attempt to save it to a non-exist @@ -1699,7 +1699,7 @@ Menu behavior is changed. * Clicking outside the menu causes cancellation of sub-menu. * <, >, +, - abandoned -From: $B$*$+$@(B +From: Okada Now C-a/C-e are bound to 'jump to the first/last item in menu.' From: "OMAE, jun" diff --git a/doc/MANUAL.html b/doc/MANUAL.html index aff0189..91a3485 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -1,535 +1,2437 @@ - + -w3m manual - - -

      w3m MANUAL

      -
      -Akinori Ito
      -aito@fw.ipsj.or.jp -
      -

      Index

      - -
    • Introduction -
    • Options -
    • Document color -
    • Key binding -
    • Lynx-like key binding -
    • Mouse operation -
    • Key customization -
    • Local CGI -
      •  - -
      - -

      Introduction

      -w3m is a pager/text-based WWW browser. You can browse local documents and/or -documents on the WWW using a terminal emulator. - -
      - -

      Options

      - -Command line usage is -

      + + w3m manual + + + + + + +

      w3m MANUAL

      +
      + Akinori Ito
      + aito@fw.ipsj.or.jp +
      +

      Index

      + +
      +

      + Introduction +

      +

      + w3m is a pager/text-based WWW browser. You can browse local + documents and/or documents on the WWW using a terminal emulator. +

      +
      +

      + Options +

      +

      + Command line usage is +

      + 
      -    w3m [options] [file|URL]
+  w3m [option]... [file|URL]...
      -

      -If you specify filenames/URLs on command line, these documents are displayed. -If you specify nothing, w3m reads a document from standard input and display it. -If no filename and/or URLs are specified and standard input is tty, w3m terminates -without displaying anything. +

      + If you specify filenames/URLs on the command line, these documents + are displayed. If you specify nothing, w3m will read a document + from standard input and display it. If it doesn't find a document + there either then normally w3m will terminate. +

      +

      + Options include: +

      +
      +

      General options

      +
      + -B +
      +
      +

      + + with no other target defined, use the bookmark page for startup +

      +
      +
      + -M +
      +
      +

      + + monochrome display +

      +
      +
      + -no-mouse +
      +
      +

      + deactivate mouse support. +

      +
      +
      + -num +
      +
      +

      + + display each line's number -

      -Options are as follows: -

      -
      +<line number> -
      Move to the specified line. -
      -t width -
      Specify tab width. Default is 8. -
      -r -
      When displaying text/plain document, prohibit emphasis using backspace. -If you don't specify this option, -``A^H_'' is interpreted as underlined character and ``A^HA'' as a bold character. -
      -l number -
      Specify line number preserved internally when reading text/plain document -fron standard input. Default is 10000. -
      -s -
      Display documents with Shift_JIS code. -
      -e -
      Display documents with EUC_JP code. -
      -j -
      Display documents with ISO-2022-JP code. -
      -T type -
      Specify document type. Without this option, document type -is determined from extension of a file. If the determination -fails, the document is regarded as text/plain. -

      -Example:
      -Read HTML document from standard input and display it +

      +
      + +
      + -v +
      +
      +

      + + with no other target defined, welcome users with a built-in page +

      +
      +
      + -W +
      +
      +

      + + toggle wrapping mode in searches +

      +
      +
      + -X +
      +
      +

      + upon exit, do not reinitialize the terminal. +

      +
      +
      + +num +
      +
      +

      + go to line num; only effective for numbers larger + than the number of lines in the terminal +

      +
      +

      Browser options

      +
      + -cols num +
      +
      +

      + + with stdout as destination; HTML is rendered to lines of num + characters +

      +
      +
      + -cookie +
      +
      +

      + + use stored cookies and accept new ones +

      +
      +
      + -no-cookie +
      +
      +

      + + neither use stored cookies nor accept new ones + +

      +
      +
      + -F +
      +
      +

      + + render frames +

      +
      +
      + -no-graph +
      +
      +

      + + do not use graphic characters for drawing HTML table and frame + borders +

      +
      +
      + -header string +
      +
      +

      + + append string to the HTTP(S) request. Expected to match + the header syntax "Variable: Value" +

      +
      +
      + -m +
      +
      +

      + display document using Internet message mode. With this + option, w3m determines document type from header information. + This is useful when reading e-mail or Usenet news posts. + +

      +
      +
      + -no-proxy +
      +
      +

      + + do not use proxy +

      +
      +
      + -post file +
      +
      +

      + use POST method to upload data defined in file. The + syntax to be used is "var1=value1[&var2=value2]…" +

      +
      +

      Text pager options

      +
      + -l num +
      +
      +

      + + number of lines preserved internally when receiving plain text + from stdin (default 10,000) +

      +
      +
      + -r +
      +
      +

      + + use caret notation to display special escape characters (such as + ANSI escapes or nroff-style backspaces for bold and underlined + characters) instead of processing them +

      +
      +
      + -s +
      +
      +

      + + squeeze multiple blank lines into one +

      +
      + +
      + -t num +
      +
      +

      + set tab width to num columns. No effect on stdout +

      +
      +

      Data type/encoding options

      +
      + -I charset +
      +
      +

      + + user defined character encoding of input data +

      +
      +
      + -O charset +
      +
      +

      + + user defined character encoding of output data +

      +
      +
      + -T type +
      +
      +

      + + explicit characterization of input data by MIME type. Without + this option, document type is determined from the extension of a + file. If the determination fails, the document is regarded as + text/plain. For example: +

      +

      + Read HTML document from standard input and display it + 

      -   cat hoge.html | w3m -T text/html
+   cat example.html | w3m -T text/html
      -

      -Display HTML source +

      + Display HTML source + 

      -   w3m -T text/plain hoge.html
+   w3m -T text/plain example.html
      -
      -m -
      Display document with Internet message mode. -With this option, w3m determines document type from header information. -It is useful when reading E-mail or NetNews messages. -
      -v -
      visual startup mode. -
      -B -
      Show the bookmark. -
      -bookmark file -
      Specify bookmark file. -
      -M -
      Monochrome display mode. -
      -F -
      Automatically render frame. -
      -S -
      Squeeze blank lines. -
      -X -
      Upon exit, do not display preserved screen. -
      -W -
      Toggle wrap search mode. -
      -o option=value -
      Specify option. The option names and values are -same as that appears in ~/.w3m/config. -
      -cookie -
      Process cookies. -
      -no-cookie -
      Don't process cookies. -
      -num -
      Show linenumber. -
      -dump -
      Read document specified by URL and dump formatted text into standard -output. The width of the document become 80. This width can be overridden -with -cols option. -
      -cols width -
      Specify document width. Used with -dump option. -
      -ppc count -
      Specify the number of pixels per character (default 8.0). Larger - values will make tables narrower. -
      -dump_source -
      Read document specified by URL and dump the source. -
      -dump_head -
      Read document specified by URL and dump headers. -
      -dump_both -
      Read document specified by URL and dump headers and the source. -
      -dump_extra -
      Read document specified by URL and dump extra informations, headers and the source. -
      -post file -
      use POST method with file content. -
      -header string -
      insert string as a header. -
      -no-proxy -
      Don't use proxy server. -
      -no-graph -
      Use ASCII character to draw frames. -
      -no-mouse -
      Don't activate mouse. -
      -config file -
      specify config file. -
      - -
      - -

      Document color

      - -Links and images are displayed as follows. -
      - - - - - -
       Color modeMonochrome mode
      linksblueunderline
      inline imagesgreenreverse
      form inputredreverse
      -
      -These colors can be customized using option setting command "o". - -
      - -

      Key binding

      - -After invocation, you can operate w3m by one-character commands from -the keyboard. -

      -Here's the original key-binding table. If you are using Lynx-like key -bindings, see the Lynx-like key binding. - -

      Page/Cursor motion

      - -
      SPC,C-vForward page -
      b,ESC vBackward page -
      l,C-fCursor right -
      h,C-bCursor left -
      j,C-nCursor down -
      k,C-pCursor up -
      JRoll up one line -
      KRoll down one line -
      ^,C-aGo to the beginning of line -
      $,C-eGo to the end of line -
      wGo to next word -
      WGo to previous word -
      >Shift screen right -
      <Shift screen left -
      .Shift screen one column right -
      ,Shift screen one column left -
      g,M-<Go to the first line -
      G,M->Go to the last line -
      ESC gGo to specified line -
      ZMove to the center line -
      zMove to the center column -
      TABMove to next hyperlink -
      C-u,ESC TABMove to previous hyperlink -
      [Move to the first hyperlink -
      ]Move to the last hyperlink -
      - -

      Hyperlink operation

      - -
      RETFollow hyperlink -
      a, ESC RETSave link to file -
      uPeek link URL -
      iPeek image URL -
      IView inline image -
      ESC ISave inline image to file -
      :Mark URL-like strings as anchors -
      ESC :Mark Message-ID-like strings as news anchors -
      cPeek current URL -
      =Display information about current document -
      C-gShow current line number -
      C-hView history of URL -
      FRender frame -
      MBrowse current document using external browser -(use 2M and 3M to invoke second and third browser) -
      ESC MBrowse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) -
      - -

      File/Stream operation

      - -
      UOpen URL -
      VView new file -
      @Execute shell command and load -
      #Execute shell command and browse -
      - -

      Buffer operation

      - -
      BBack to the previous buffer -
      vView HTML source -
      sSelect buffer -
      EEdit buffer source -
      C-lRedraw screen -
      RReload buffer -
      SSave buffer -
      ESC sSave source -
      ESC eEdit buffer image -
      - -

      Buffer selection mode

      - -
      k, C-pSelect previous buffer -
      j, C-nSelect next buffer -
      DDelect current buffer -
      RETGo to the selected buffer -
      - -

      Bookmark operation

      - -
      ESC bLoad bookmark -
      ESC aAdd current to bookmark -
      - -

      Search

      - -
      /,C-sSearch forward -
      ?,C-rSearch backward -
      nSearch next -
      NSearch previous -
      C-wToggle wrap search mode -
      - -

      Mark operation

      - -
      C-SPCSet/unset mark -
      ESC pGo to previous mark -
      ESC nGo to next mark -
      "Mark by regular expression -
      - -

      Miscellany

      - -
      !Execute shell command -
      HHelp (load this file) -
      oSet option -
      C-kShow cookie jar -
      C-cStop -
      C-zSuspend -
      qQuit (with confirmation, if you like) -
      QQuit without confirmation -
      - -

      Line-edit mode

      - -
      C-fMove cursor forward -
      C-bMove cursor backward -
      C-hDelete previous character -
      C-dDelete current character -
      C-kKill everything after cursor -
      C-uKill everything before cursor -
      C-aMove to the top of line -
      C-eMove to the bottom of line -
      C-pFetch the previous string from the history list -
      C-nFetch the next string from the history list -
      TAB,SPCComplete filename -
      RETURNAccept -
      - -
      - -

      Lynx-like key binding

      - -If you have chosen `Lynx-like key binding' at the compile time, -you can use the following key binding. - -

      Page/Cursor motion

      - -
      SPC,C-v,+Forward page -
      b,ESC v,-Previous page -
      lCursor right -
      hCursor left -
      jCursor down -
      kCursor up -
      JRoll up one line -
      KRoll down one line -
      ^Go to the beginning of line -
      $Go to the end of line -
      >Shift screen right -
      <Shift screen left -
      C-aGo to the first line -
      C-eGo to the last line -
      GGo to the specified line -
      ZMove to the center line -
      zMove to the center column -
      TAB,C-n,Down arrowMove to next hyperlink -
      ESC TAB,C-p,Up arrowMove to previous link -
      C-gShow current page position -
      - +
      +

      Options for data output, followed by immediate exit

      +
      + -dump +
      +
      +

      + read document specified by URL and dump page rendered as text + into standard output. + + Is set implicitly when output is directed + to a file or pipe. A width of 80 columns is used unless option + -cols sets another value. +

      +
      +
      + -dump_source +
      +
      +

      + + dump the page's source code into stdout +

      +
      +
      + -dump_head +
      +
      +

      + + dump response of a HEAD request for a URL into stdout +

      +
      +
      + -dump_both +
      +
      +

      + + dump HEAD, and source code for a URL into stdout -

      Hyperlink operation

      - -
      RET, C-f, Right arrowFollow hyperlink -
      d, ESC RETSave link to file -
      uPeek link URL -
      iPeek image URL -
      IView inline image -
      ESC ISave inline image to file -
      :Mark URL-like strings as anchors -
      ESC :Mark Message-ID-like strings as news anchors -
      cPeek current URL -
      =Display information about current document -
      C-hView history of URL -
      FRender frame -
      MBrowse current document using external browser -(use 2M and 3M to invoke second and third browser) -
      ESC MBrowse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) -
      +

      +
      +
      + -dump_extra +
      +
      +

      + + dump HEAD, source code, and extra information for a URL into + stdout +

      +
      -

      File/Stream operation

      - -
      g,UOpen URL -
      VView new file -
      @Execute shell command and load -
      #Execute shell command and browse -
      +

      Options for overriding default settings and resources

      + +
      + -bookmark file +
      +
      +

      + + use file instead of the default bookmark.html file +

      +
      +
      + -config file +
      +
      +

      + + use file instead of the default configuration file +

      +
      +
      + -o option=value +
      +
      +

      + + modify one configuration item with an explicitly given value; without option=value, equivalent to -show-option +

      +
      +
      +
      +

      + Document Colors +

      +

      + Hyperlinks and images are displayed as follows. +

      +
      + + + + + + + + + + + + + + + + + + + + + +
      + + Color mode + + Monochrome mode +
      + Hyperlinks + + blue + + underline +
      + Inline images + + green + + reverse +
      + Form input + + red + + reverse +
      +
      +

      + These colors can be customized using the options setting command + o. +

      +
      +

      + Functions and Key bindings +

      + +

      + After invocation, you can control w3m by typing in functions by name + or with keystroke combinations bound to a function. There are + default key bindings. + +

      + +

      + You can customize the key bindings (except those for menu + operations and line-editing) in a ~/.w3m/keymap file. For example, +

      -

      Buffer operation

      - -
      B, C-b, Left arrowBack to the previous buffer -
      \View HTML source -
      s, C-hSelect buffer -
      EEdit buffer source -
      C-l, C-wRedraw screen -
      R, C-rReload buffer -
      S, pSave buffer -
      ESC sSave source -
      ESC eEdit buffer image -
      - -

      Buffer selection mode

      - -
      k, C-pSelect previous buffer -
      j, C-nSelect next buffer -
      DDelect current buffer -
      RETGo to the selected buffer -
      - -

      Bookmark operation

      - -
      v, ESC bLoad bookmark -
      a, ESC aAdd current to bookmark -
      - -

      Search

      - -
      /, C-sSearch forward -
      nSearch next -
      wToggle wrap search mode -
      - -

      Mark operation

      - -
      C-SPCSet/unset mark -
      PGo to previous mark -
      NGo to next mark -
      "Mark by regular expression -
      - -

      Miscellany

      - -
      !Execute shell command -
      H, ?Help (load this file) -
      oSet option -
      C-kShow cookie jar -
      C-cStop -
      C-zSuspend -
      qQuit (with confirmation, if you like) -
      QQuit without confirmation -
      - -

      Line-edit mode

      - -
      C-fMove cursor forward -
      C-bMove cursor backward -
      C-hDelete previous character -
      C-dDelete current character -
      C-kKill everything after cursor -
      C-uKill everything before cursor -
      C-aMove to the top of line -
      C-eMove to the bottom of line -
      C-pFetch the previous string from the history list -
      C-nFetch the next string from the history list -
      TAB,SPCComplete filename -
      RETURNAccept -
      - -
      - -

      Mouse operation

      -If w3m is compiled with mouse option and you are using -xterm/kterm/rxvt (in this case, you have to set the TERM -environment variable to `xterm' or `kterm'.) or GPM -environment, you can use mouse -for the navigation. -

      - -
      left click -Move the cursor to the place pointed by the mouse cursor. -If you click the cursor and it is on an anchor, follow the anchor. -
      middle click -Back to the previous buffer. -
      right click -Open pop-up menu. You can choose an item by clicking it. -
      left drag -Scroll document. The default behavior is to grab the document -and drag it. You can reverse the behavior (grab the window and drag it) -with the option setting panel. -
      -

      +

      +   keymap C-o NEXT_PAGE
+
      +

      + binds the command NEXT_PAGE (normally bound to SPC and C-v) + to control-o. See README.func for a list + of available functions. Original and Lynx-like keymap definitions + are provided as examples: keymap.default + and keymap.lynx. +

      -
      - -

      Key customization

      -You can customize the key binding (except line-editing keymap) -by describing ~/.w3m/keymap. For example, -
      +   
      
+   Throughout, the C- and M- notations indicate the
+   modifiers control and meta. The ALT-key
+   replaces the latter whereas pressing the ESC-key toggles
+   between meta-modified and simple keystrokes. The minus
+   indicates pressing the keys simultaneously wheras a space
+   represents that one key is pressed after the other, i.e. 2 M
+   simply means 2 followed by M.
+  
      
 
-   keymap C-o NEXT_PAGE
 
-
      -binds `NEXT_PAGE' function (normally bound to SPC and C-v) -to control-o. See README.func for -list of available functions. Original and Lynx-like keymap -definitions are provided (keymap.default -and keymap.lynx) as examples. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + Function + Key binding + + Description +
      + Default + + Lynx-like +
      +

      In-page navigation

      +
      + NEXT_PAGE + + SPC, C-v, +, PGDN + + SPC, C-v, + + + Scroll one page downwards +
      + PREVIOUS_PAGE + + b, M-v, -, PGUP + + b, M-v, - + + Scroll one page upwards +
      + MOVE_RIGHT + + l, C-f, RIGHT + + l + + Move cursor right (with a half-screen shift at the screen edge) +
      + MOVE_LEFT + + h, C-b, LEFT + + h + + Move cursor left (with a half-screen shift at the screen edge) +
      + MOVE_DOWN + + j, C-n, DOWN + + j + + Move cursor down (with a one-line scroll at the screen edge) +
      + MOVE_UP + + k, C-p, UP + + k + + Move cursor up (with a one-line scroll at the screen edge) +
      + UP + + J + + J + + Scroll the screen up one line +
      + DOWN + + K + + K + + Scroll the screen down one line +
      + LINE_BEGIN + + ^, C-a + + ^ + + Go to the beginning of the line +
      + LINE_END + + $, C-e + + $ + + Go to the end of the line +
      + NEXT_WORD + + w + + w + + Move to the next word +
      + PREVIOUS_WORD + + W + + W + + Move to the previous word +
      + SHIFT_RIGHT + + > + + > + + Shift screen right +
      + SHIFT_LEFT + + < + + < + + Shift screen left +
      + RIGHT + + . + + . + + Shift screen one column right +
      + LEFT + + , + + , + + Shift screen one column left +
      + BEGIN + + g, M-<, HOME + + C-a, M-< + + Go to the first line +
      + END + + G, M->, END + + C-e, M-> + + Go to the last line +
      + GOTO_LINE + + M-g + + G + + Go to the specified line +
      + LINE_INFO + + C-g + + C-g + + Display current position in document +
      + CENTER_H + + Z + + Z + + Center screen right and left of the cursor column +
      + CENTER_V + + z + + z + + Center screen above and below the cursor line +
      + NEXT_LINK + + TAB + + TAB, C-n, DOWN + + Move to the next hyperlink +
      + PREVIOUS_LINK + + M-TAB, C-u + + M-TAB, C-u, C-p, UP + + Move to the previous hyperlink +
      + LINK_BEGIN + + [ + + [ + + Move to the first hyperlink +
      + LINK_END + + ] + + ] + + Move to the last hyperlink +
      MOVE_LIST_MENUM-mM-mPop up menu to navigate between hyperlinks
      +

      Hyperlink Operations

      +
      + GOTO_LINK + + C-j, C-m, RET + + C-f, C-j, C-m, RET, RIGHT + + Follow current hyperlink in a new buffer +
      LIST_MENUM-lM-lPop up hyperlink menu and select one to be followed
      + SAVE_LINK + + a, M-RET + + d, M-RET + + Save the hyperlink target +
      + PEEK_LINK + + u + + u + + Show target address +
      + PEEK_IMG + + i + + i + + Show image address +
      + VIEW_IMAGE + + I + + I + + Display image in viewer +
      + SAVE_IMAGE + + M-I + + M-I + + Save inline image +
      MARK_WORD;;Turn current word into hyperlink
      + MARK_URL + + : + + : + + Turn URL-like strings into hyperlinks +
      + MARK_MID + + M-: + + M-: + + + Turn Message-ID-like strings into hyperlinks +
      + PEEK + + c + + c + + Show current address +
      + INFO + + = + + = + + Display information about the current document +
      + HISTORY + + C-h + + C-h + + Show browsing history +
      + EXTERN + + M + + M + + Browse current document using external browser (prefix 2, 3, ..., + or 9 to invoke alternate configured browsers, e.g. 3 M) +
      + EXTERN_LINK + + M-M + + M-M + + Browse link using external browser (prefixed as above, e.g. + 3 M-M) +
      +

      Bookmark management

      +
      + BOOKMARK + + M-b + + v, M-b + + View bookmarks +
      + ADD_BOOKMARK + + M-a + + a, M-a + + Add current page to bookmarks +
      +

      File/Stream Operations

      +
      + GOTO + + U + + g, U + + Open specified document in a new buffer +
      GOTO_RELATIVEM-uM-uOpen relative address in a new buffer
      + LOAD + + V + + V + + Open local file in a new buffer +
      + READ_SHELL + + @ + + @ + + + + Execute shell command and display output in a new buffer +
      + PIPE_SHELL + + # + + # + + + + Execute shell command and display output in a new buffer +
      +

      Content Operations

      +
      + VIEW + + v + + \ + + Toggle between source code and rendered view of the document +
      LISTLLList link elements, hyperlinks and images
      + FRAME + + F + + F + + Toggle rendering HTML frames +
      + REDRAW + + C-l + + C-l, C-w + + Draw the screen anew +
      + RELOAD + + R + + R, C-r + + Load current document anew +
      + EDIT + + E + + E + + Edit local source +
      + EDIT_SCREEN + + M-e + + M-e + + Edit rendered copy of document +
      PIPE_BUF||Pipe current buffer through a shell command and display output
      + DOWNLOAD + + M-s + + M-s + + Save document source +
      + SAVE_SCREEN + + S + + S, p + + Save rendered document +
      +

      Buffer/Tab Navigation

      +
      + BACK + + B + + B, C-b, LEFT + + Close current buffer and return to the one below in stack +
      + GOTO_HOME + + C-_ + + + Return to the homepage (specified HTTP_HOME or WWW_HOME variable) +
      + SELECT_MENU + + s + + s, C-h + + Pop up buffer-stack menu +
      + TAB_MENU + + M-t + + M-t + + Pop up tab selection menu +
      + NEW_TAB + + T + + T + + Open a new tab (with current document) +
      + TAB_LINK + + C-t + + C-t + + Follow current hyperlink in a new tab +
      + NEXT_TAB + + } + + } + + Switch to the next tab +
      + PREV_TAB + + { + + { + + Switch to the previous tab +
      + CLOSE_TAB + + C-q + + C-q + + Close the current tab +
      +

      Searches

      +
      + SEARCH + + / + + /, C-s + + Search forward +
      + SEARCH_BACK + + ? + + + Search backward +
      + ISEARCH + + C-s + + + Incremental search forward +
      + ISEARCH_BACK + + C-r + + + Incremental search backward +
      + SEARCH_NEXT + + n + + n + + Continue search forward +
      + SEARCH_PREV + + N + + + Continue search backward +
      + WRAP_TOGGLE + + C-w + + w + + Toggle wrapping mode in searches +
      +

      Mark Management

      +
      + MARK + + C-SPC + + C-SPC + + Set/unset mark +
      + PREV_MARK + + M-p + + P + + Go to the previous mark +
      + NEXT_MARK + + M-n + + N + + Go to the next mark +
      + REG_MARK + + " + + " + + Mark all occurrences of a pattern +
      +

      Miscellaneous

      +
      + COMMAND + + M-c + + M-c + + Invoke one or more semicolon-separated w3m functions +
      + HELP + + H + + H, ? + + Show help panel +
      + OPTIONS + + o + + o + + Display options setting panel +
      SET_OPTIONM-oM-oSet option
      DEFINE_KEYM-kM-kDefine a binding between a key stroke combination and a command
      MOUSE_TOGGLEmmToggle mouse support
      DOWNLOAD_LISTDDDisplay downloads panel
      + COOKIE + + C-k + + C-k + + Show cookie jar +
      UNDO((Cancel the last cursor movement
      REDO))Cancel the last undo
      + EXEC_SHELL + + ! + + ! + + Execute shell command +
      DICT_WORDM-wM-wExecute dictionary command (see README.dict)
      DICT_WORD_ATM-WM-WExecute dictionary command for word at cursor
      VERSIONrrDisplay the version of w3m
      + SUSPEND + + C-z + + C-z + + Suspend w3m to background. (To be withdrawn with shell + command fg.) +
      + QUIT + + q + + q + + Quit with confirmation request +
      + EXIT + + Q + + Q + + Quit at once +
      -
      - -

      Local CGI

      -You can run CGI scripts using w3m, without any HTTP server. -It means that w3m behaves like an HTTP server and activates CGI script, -then w3m reads the output of the script and display it. The -bookmark registration -and helper-app editor -are realized as local CGI scripts. -Using local CGI, w3m can be used as a general purpose form interface. -

      -For security reason, CGI scripts invoked by w3m must be in one of -these directories. -

        -
      • The directory where w3m-related files are stored -(typically /usr/local/lib/w3m). This directory can be referred -as $LIB. -
      • /cgi-bin/ directory. You can map /cgi-bin/ to any directory you like -with option setting panel (``Directory corresponds to /cgi-bin'' field). -You can specify multiple paths separated by `:', like -/usr/local/cgi-bin:/home/aito/cgi-bin. To use /cgi-bin/ directory, -you must use file:/cgi-bin URL as follows: +

        + There are the following operational modes with built-in key + bindings for relevant functions. These bindings are not subject to + the DEFINE_KEY function or entries in the file keymap. +

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + Function
        (internal name) +         		Key binding + + Description +
        +

        Menu Selection Mode

        +
        + BUF:NEXT + j, C-n, DOWN + + Next item +
        BUF:PREV + + k, C-p, UP + + Previous item +
        + BUF:DELETE + D + + Delete item +
        + BUF:GO + + SPC, RET, RIGHT + + Select item +
        +

        Popup Menu Mode

        +
        +MENU:SELECT + + SPC, RET, RIGHT + Select +
        +MENU:CLOSE + C-c + + Close menu +
        +MENU:CANCEL + + LEFT, BKSPC, C-h + One selection step backward +
        +MENU:DOWN + j, C-n, DOWN + + Move to the next item +
        +MENU:UP + + k, C-p, UP + Move to the previous item +
        +MENU:LINE_UP + K + + Scroll up one item +
        +MENU:LINE_DOWN + J + + Scroll down one item +
        +MENU:TOP + C-a + + Move to the first item +
        +MENU:LAST + C-e + + Move to the final item +
        +MENU:NEXT + C-v, C-f + Go to the next page +
        +MENU:PREV + ESC v, C-b + + Go to the previous page +
        +MENU:SEARCH_FORE + C-s, / + + Search forward +
        +MENU:SEARCH_BACK + + C-r, ? + Search backward +
        +MENU:SEARCH_NEXT + + n + Search for the next match
        +MENU:SEARCH_PREV + + N + Search for the previous match
        +

        Line-editing Mode

        +
        + LINEEDIT:FORWARD + + C-f, RIGHT + + Move cursor forward +
        +LINEEDIT:BACK + + C-b, LEFT + + Move cursor backward +
        +LINEEDIT:BS + + C-h, BKSPC + + Delete previous character +
        +LINEEDIT:DEL + + C-d + + Delete current character +
        +LINEEDIT:KILL_AFTER + + C-k + + Delete everything after cursor +
        +LINEEDIT:KILL_BEFORE + + C-u + + Delete everything before cursor +
        +LINEEDIT:TOP + + C-a + + Move to the beginning of the line +
        +LINEEDIT:BOTTOM + + C-e + + Move to the end of the line +
        +LINEEDIT:PREV + + C-p, UP + + Fetch the previous string from the history list +
        +LINEEDIT:NEXT + + C-n, DOWN + + Fetch the next string from the history list +
        +LINEEDIT:COMPLETE + + TAB, SPC + + Try to complete filename +
        +LINEEDIT:EDITOR + + C-o + + Edit with external editor +
        +LINEEDIT:ACCEPT + + RET + + Accept input line +
        + + +
        +

        + Mouse Operation +

        +

        + If w3m is compiled with mouse support and you are invoking w3m + either from a console with GPM or from an X terminal emulator, you + can use the mouse for navigation (in the case of rxvt, you need to + set the TERM environment variable to xterm or kterm). +

        +

        An introduction to configure mouse actions is provided + with README.mouse. +

        + + + + + + + + + + + + + + + + + + + + + + + + + +
        Operation + Description +
        + left click + +First:
        +Moves the cursor to the place indicated by the mouse pointer.
        +Then:
        +Follows a hyperlink the cursor is currently located and the mouse points to. +
        + middle click + + Back to the previous buffer. +
        + right click + + Open pop-up menu. You can choose an item by clicking it. +
        + left drag + + Scroll document. The default behavior is to grab the document + and drag it. You can reverse the behavior (grab the window and + drag it) with the options setting panel. +
        +
        +

        + Local CGI scripts +

        +

        + You can run CGI scripts using w3m, without any HTTP server. + This means that w3m behaves like an HTTP server and runs the CGI + script, then reads the output of the script and displays it. For + example, the bookmark registration system and default directory + browser are realized as local CGI scripts. Moreover, such scripts + allow w3m to be used as a form interface to acquire all kinds of + data. +

        +

        + For security reason, CGI scripts invoked by w3m must be in one of + the following directories: +

        +
          +
        • + The directory where w3m-related files are stored (typically + /usr/local/lib/w3m). This directory can be referenced as $LIB. +
          • +
        • + The /cgi-bin/ directory. You can map /cgi-bin/ to any directory you + like in the options setting panel (the Directory corresponds to + /cgi-bin field). You can specify multiple paths separated by + :, like /usr/local/cgi-bin:/home/aito/cgi-bin. It is not + recommended to include the current directory to this path. To use + a /cgi-bin/ directory, you must use a file:/cgi-bin URL as follows: + 
          •   w3m -o cgi_bin=/path/to/cgi-bin file:/cgi-bin/script.cgi
          -It is not recommended to include current directory to this path. -
        -

        -The CGI script can use special header `w3m-control:' to control w3m. -This field can take any function (see README.func), -and the specified function is invoked after the document is displayed. -For example, The CGI output +

      +

      + The CGI script can use the special header + w3m-control: to + control w3m. This field can take any function (see + README.func), and the specified function + is invoked after the document is displayed. For example, the CGI + output + 

      -
 Content-Type: text/plain
 W3m-control: BACK
-
      -will display blank page and delete that buffer immediately. -This is useful when you don't want to display any page after -the script is invoked. The next example +

      + will display a blank page and delete that buffer immediately. + This is useful when you don't want to display any page after + the script is invoked. The next example + 

      -
 Content-Type: text/plain
 W3m-control: DELETE_PREVBUF
-
 contents.....
      -will override the current buffer. -

      -One w3m-control: header have to contain only one function, but you can -include more than one w3m-control: lines in the HTTP header. -In addition, you can specify an argument to GOTO function: +

      + will override the current buffer. +

      +

      + Each header w3m-control: can + contain only one function, but you can + include more than one w3m-control: + line in the HTTP header. + In addition, you can specify an argument to the GOTO function: + 

      -
 Content-Type: text/plain
-W3m-control: GOTO http://www.yahoo.com/
-
+W3m-control: GOTO http://www.example.org/
      -This example works exactly the same way to the Location header: +

      + This example works exactly the same way as the Location header: + 

      -
 Content-Type: text/plain
-Location: http://www.yahoo.com/
-
+Location: http://www.example.org/
      -Note that this header has no effect when the CGI script is invoked -through HTTP server. - - +

      + Note that this header has no effect when the CGI script is invoked + through an HTTP server. +

      + diff --git a/doc/README b/doc/README index 324ea3e..60d6d19 100644 --- a/doc/README +++ b/doc/README @@ -115,7 +115,6 @@ Current Maintainer Tohoku University Hospital satodai@w3m.jp -Feel free to send your opinion to the w3m mailing-lists. - w3m-dev@sic.med.tohoku.ac.jp (Japanese) - w3m-dev-en@sic.med.tohoku.ac.jp (English) +Feel free to send your opinion to: http://w3m.sourceforge.net/ + https://sourceforge.net/projects/w3m/ diff --git a/doc/README.cookie b/doc/README.cookie index 56cca50..71523e0 100644 --- a/doc/README.cookie +++ b/doc/README.cookie @@ -9,21 +9,21 @@ cookie support of w3m http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-12.txt) cookie. - * If you wont to disable cookie support, run configure script with + * If you want to disable cookie support, run the configure script with --disable-cookie option. - * You can choose to use cookie or not on the Option Setting Panel or + * You can choose to use cookies or not on the Option Setting Panel or -cookie and -no-cookie option. - * You can disable cookie on the Option Setting Panel. In this case - all cookies are rejected, however, cookies which accepted before - disable cookie are used. + * You can disable cookies on the Option Setting Panel. In this case + all new cookies are rejected, however, cookies which were accepted before + cookies were disabled are used. - * You can see list of accepted cookies with C-k. In this panel, you + * You can see the list of accepted cookies with C-k. In this panel, you can choose to use each cookie or not. - * You can specify domains accept or not accept cookies on the Option - Setting Panel. Domains are specified with following format. + * You can specify domains from which to accept or not accept cookies + on the Option Setting Panel. Domains are specified in the following format: domain-list = domains | "" @@ -37,7 +37,7 @@ cookie support of w3m (HDN: host domain name) - If the number of "." in domain name is lesser than 2, it is + * If the number of "." in domain name is fewer than 2, it is assumed as invalid cookie (cf. RFC 2109 4.3.2), however, you can use cookie_avoid_wrong_number_of_dots to avoid this restriction. You can set this in "Domains to avoid [wrong number diff --git a/doc/README.dict b/doc/README.dict index bd82cdb..88f4b1a 100644 --- a/doc/README.dict +++ b/doc/README.dict @@ -2,14 +2,14 @@ Dictionary look-up hack for w3m 1. INTRODUCTION -If you have dictionary look-up command (like 'webster'), you can -look a word in a document using w3m. This dictionary-lookup code +If you have a dictionary look-up command (such as 'webster'), you can +look up words in a document using w3m. This dictionary-lookup code was contributed by `Rubikitch' (rubikitch@ruby-lang.org), and -further modifed by Tushar Samant (scribble at pobox.com). +further modified by Tushar Samant (scribble at pobox.com). 2. INSTALLATION -To make use of dictionary look-up, you currently must change a +To make use of the dictionary look-up, you currently must change a compile option by hand. After running configure, edit config.h and change @@ -19,7 +19,7 @@ to #define USE_DICT -and recompile w3me (i.e. type "make install"). +and recompile w3m (i.e. type "make install"). Note that w3m/0.3+cvs-1.373 or later, USE_DICT is defined by default. Then find or install a CGI program which takes a word as a query diff --git a/doc/README.func b/doc/README.func index 0b2c034..0430855 100644 --- a/doc/README.func +++ b/doc/README.func @@ -1,145 +1,147 @@ -ABORT Quit w3m without confirmation -ACCESSSKEY Popup acceskey menu -ADD_BOOKMARK Add current page to bookmark +ABORT Quit at once +ACCESSKEY Pop up accesskey menu +ADD_BOOKMARK Add current page to bookmarks ALARM Set alarm -BACK Back to previous buffer +BACK Close current buffer and return to the one below in stack BEGIN Go to the first line -BOOKMARK Read bookmark -CENTER_H Move to the center line -CENTER_V Move to the center column -CHARSET Change the current document charset -CLOSE_TAB Close current tab -CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action) -COMMAND Execute w3m command(s) +BOOKMARK View bookmarks +CENTER_H Center on cursor column +CENTER_V Center on cursor line +CHARSET Change the character encoding for the current document +CLOSE_TAB Close tab +CLOSE_TAB_MOUSE Close tab at mouse pointer +COMMAND Invoke w3m function(s) COOKIE View cookie list -DEFAULT_CHARSET Change the default document charset -DEFINE_KEY Define a binding between a key stroke and a user command -DELETE_PREVBUF Delete previous buffer (mainly for local-CGI) +DEFAULT_CHARSET Change the default character encoding +DEFINE_KEY Define a binding between a key stroke combination and a command +DELETE_PREVBUF Delete previous buffer (mainly for local CGI-scripts) DICT_WORD Execute dictionary command (see README.dict) -DICT_WORD_AT Execute dictionary command for word at cursor +DICT_WORD_AT Execute dictionary command for word at cursor DISPLAY_IMAGE Restart loading and drawing of images -DOWN Scroll down one line -DOWNLOAD Save document source to file -DOWNLOAD_LIST Display download list panel -EDIT Edit current document -EDIT_SCREEN Edit currently rendered document +DOWN Scroll the screen down one line +DOWNLOAD Save document source +DOWNLOAD_LIST Display downloads panel +EDIT Edit local source +EDIT_SCREEN Edit rendered copy of document END Go to the last line -EXEC_SHELL Execute shell command -EXIT Quit w3m without confirmation -EXTERN Execute external browser -EXTERN_LINK View current link using external browser -FRAME Render frame -GOTO Go to URL -GOTO_LINE Go to specified line -GOTO_LINK Go to current link -GOTO_RELATIVE Go to relative URL -HELP View help -HISTORY View history of URL -INFO View info of current document -INTERRUPT Stop loading document -INIT_MAILCAP Reread mailcap (mainly for local-CGI) -ISEARCH Incremental search forward +EXEC_SHELL Execute shell command and display output +EXIT Quit at once +EXTERN Display using an external browser +EXTERN_LINK Display target using an external browser +FRAME Toggle rendering HTML frames +GOTO Open specified document in a new buffer +GOTO_HOME Return to the homepage (specified HTTP_HOME or WWW_HOME variable) +GOTO_LINE Go to the specified line +GOTO_LINK Follow current hyperlink in a new buffer +GOTO_RELATIVE Go to relative address +HELP Show help panel +HISTORY Show browsing history +INFO Display information about the current document +INTERRUPT Suspend w3m to background +ISEARCH Incremental search forward ISEARCH_BACK Incremental search backward -LEFT Shift screen one column -LINE_BEGIN Go to the beginning of line -LINE_END Go to the end of line -LINE_INFO Show current line number -LINK_BEGIN Go to the first link -LINK_END Go to the last link -LINK_MENU Popup link element menu -LIST Show all links and images -LIST_MENU Popup link list menu and go to selected link -LOAD Load local file -MAIN_MENU Popup menu +LEFT Shift screen one column left +LINE_BEGIN Go to the beginning of the line +LINE_END Go to the end of the line +LINE_INFO Display current position in document +LINK_BEGIN Move to the first hyperlink +LINK_END Move to the last hyperlink +LINK_MENU Pop up link element menu +LIST Show all URLs referenced +LIST_MENU Pop up menu for hyperlinks to browse to +LOAD Open local file in a new buffer +MAIN_MENU Pop up menu MARK Set/unset mark -MARK_MID Mark Message-ID-like strings as anchors -MARK_URL Mark URL-like strings as anchors -MARK_WORD Mark current word as anchor -MENU Popup menu -MENU_MOUSE Popup menu at mouse cursor (for mouse action) -MOUSE_TOGGLE Toggle activity of mouse -MOVE_DOWN Move cursor down (a half screen scroll at the end of screen) -MOVE_DOWN1 Move cursor down (1 line scroll at the end of screen) -MOVE_LEFT Move cursor left (a half screen shift at the left edge) -MOVE_LEFT1 Move cursor left (1 columns shift at the left edge) -MOVE_LIST_MENU Popup link list menu and move cursor to selected link -MOVE_MOUSE Move cursor to mouse cursor (for mouse action) -MOVE_RIGHT Move cursor right (a half screen shift at the right edge) -MOVE_RIGHT1 Move cursor right (1 columns shift at the right edge) -MOVE_UP Move cursor up (a half screen scroll at the top of screen) -MOVE_UP1 Move cursor up (1 line scrol at the top of screen) -MSGS Display error messages -NEW_TAB Open new tab -NEXT Move to next buffer -NEXT_DOWN Move to next downward link -NEXT_LEFT Move to next left link -NEXT_LEFT_UP Move to next left (or upward) link -NEXT_LINK Move to next link -NEXT_MARK Move to next word -NEXT_PAGE Move to next page -NEXT_RIGHT Move to next right link -NEXT_RIGHT_DOWN Move to next right (or downward) link -NEXT_TAB Move to next tab -NEXT_UP Move to next upward link -NEXT_VISITED Move to next visited link -NEXT_WORD Move to next word -NOTHING Do nothing +MARK_MID Turn Message-ID-like strings into hyperlinks +MARK_URL Turn URL-like strings into hyperlinks +MARK_WORD Turn current word into hyperlink +MENU Pop up menu +MENU_MOUSE Pop up menu at mouse pointer +MOUSE_TOGGLE Toggle mouse support +MOVE_DOWN Cursor down +MOVE_DOWN1 Cursor down. With edge touched, slide +MOVE_LEFT Cursor left +MOVE_LEFT1 Cursor left. With edge touched, slide +MOVE_LIST_MENU Pop up menu to navigate between hyperlinks +MOVE_MOUSE Move cursor to mouse pointer +MOVE_RIGHT Cursor right +MOVE_RIGHT1 Cursor right. With edge touched, slide +MOVE_UP Cursor up +MOVE_UP1 Cursor up. With edge touched, slide +MSGS Display error messages +NEW_TAB Open a new tab (with current document) +NEXT Switch to the next buffer +NEXT_DOWN Move downward to the next hyperlink +NEXT_HALF_PAGE Scroll down half a page +NEXT_LEFT Move left to the next hyperlink +NEXT_LEFT_UP Move left or upward to the next hyperlink +NEXT_LINK Move to the next hyperlink +NEXT_MARK Go to the next mark +NEXT_PAGE Scroll down one page +NEXT_RIGHT Move right to the next hyperlink +NEXT_RIGHT_DOWN Move right or downward to the next hyperlink +NEXT_TAB Switch to the next tab +NEXT_UP Move upward to the next hyperlink +NEXT_VISITED Move to the next visited hyperlink +NEXT_WORD Move to the next word +NOTHING Do nothing NULL Do nothing -OPTIONS Option setting panel -PEEK Peek current URL -PEEK_IMG Peek image URL -PEEK_LINK Peek link URL -PIPE_BUF Send rendered document to pipe -PIPE_SHELL Execute shell command and browse -PREV Move to previous buffer -PREV_LINK Move to previous link -PREV_MARK Move to previous mark -PREV_PAGE Move to previous page -PREV_TAB Move to previous tab -PREV_VISITED Move to previous visited link -PREV_WORD Move to previous word -PRINT Save buffer to file -QUIT Quit w3m -READ_SHELL Execute shell command and load +OPTIONS Display options setting panel +PEEK Show current address +PEEK_IMG Show image address +PEEK_LINK Show target address +PIPE_BUF Pipe current buffer through a shell command and display output +PIPE_SHELL Execute shell command and display output +PREV Switch to the previous buffer +PREV_HALF_PAGE Scroll up half a page +PREV_LINK Move to the previous hyperlink +PREV_MARK Go to the previous mark +PREV_PAGE Scroll up one page +PREV_TAB Switch to the previous tab +PREV_VISITED Move to the previous visited hyperlink +PREV_WORD Move to the previous word +PRINT Save rendered document +QUIT Quit with confirmation request +READ_SHELL Execute shell command and display output REDO Cancel the last undo -REDRAW Redraw screen -REG_MARK Set mark using regexp -REINIT Reload configuration files -RELOAD Reload buffer -RESHAPE Re-render buffer +REDRAW Draw the screen anew +REG_MARK Mark all occurences of a pattern +REINIT Reload configuration file +RELOAD Load current document anew +RESHAPE Re-render document RIGHT Shift screen one column right -SAVE Save document source to file -SAVE_IMAGE Save image to file -SAVE_LINK Save link to file -SAVE_SCREEN Save rendered document to file +SAVE Save document source +SAVE_IMAGE Save inline image +SAVE_LINK Save hyperlink target +SAVE_SCREEN Save rendered document SEARCH Search forward SEARCH_BACK Search backward SEARCH_FORE Search forward -SEARCH_NEXT Search next regexp -SEARCH_PREV Search previous regexp -SELECT Go to buffer selection panel -SELECT_MENU Popup buffer selection menu -SETENV Set environment variable -SET_OPTION Set option -SHELL Execute shell command +SEARCH_NEXT Continue search forward +SEARCH_PREV Continue search backward +SELECT Display buffer-stack panel +SELECT_MENU Pop up buffer-stack menu +SETENV Set environment variable +SET_OPTION Set option +SHELL Execute shell command and display output SHIFT_LEFT Shift screen left SHIFT_RIGHT Shift screen right -SOURCE View HTML source +SOURCE Toggle between HTML shown or processed STOP_IMAGE Stop loading and drawing of images SUBMIT Submit form -SUSPEND Stop loading document -TAB_GOTO Open URL on new tab -TAB_GOTO_RELATIVE Open relative URL on new tab -TAB_LEFT Move current tab left -TAB_LINK Open current link on new tab -TAB_MENU Popup tab selection menu -TAB_MOUSE Move to tab on mouse cursor (for mouse action) -TAB_RIGHT Move current tab right +SUSPEND Suspend w3m to background +TAB_GOTO Open specified document in a new tab +TAB_GOTO_RELATIVE Open relative address in a new tab +TAB_LEFT Move left along the tab bar +TAB_LINK Follow current hyperlink in a new tab +TAB_MENU Pop up tab selection menu +TAB_MOUSE Select tab by mouse action +TAB_RIGHT Move right along the tab bar UNDO Cancel the last cursor movement -UP Scroll up one line -VERSION Display version of w3m -VIEW View HTML source -VIEW_BOOKMARK View bookmark -VIEW_IMAGE View image -WHEREIS Search forward -WRAP_TOGGLE Toggle wrap search mode +UP Scroll the screen up one line +VERSION Display the version of w3m +VIEW Toggle between HTML shown or processed +VIEW_BOOKMARK View bookmarks +VIEW_IMAGE Display image in viewer +WHEREIS Search forward +WRAP_TOGGLE Toggle wrapping mode in searches diff --git a/doc/README.img b/doc/README.img index 0c10114..af6d9db 100644 --- a/doc/README.img +++ b/doc/README.img @@ -11,8 +11,8 @@ Introduction Support - * Display inline image (GIF,PNG,JPEG, etc.) on terminals - (xterm,rxvt, etc.) of X11, Linux framebuffer device or + * Display inline images (GIF, PNG, JPEG, etc.) on terminals + (xterm, rxvt, etc.) of X11, Linux framebuffer device or terminals of Windows. * Support inline image of tag. Support of attributes "width", "height", and "align". @@ -41,7 +41,7 @@ Key functions Specify the following keymaps in ~/.w3m/keymap. keymap X DISPLAY_IMAGE keymap C-c STOP_IMAGE - keyamp t SET_OPTION display_image=toggle + keymap t SET_OPTION display_image=toggle Commandline options @@ -66,7 +66,7 @@ Option panel Automatic loading of inline image. The default is ON. If it is OFF, loading starts with a command DISPLAY_IMAGE. max_load_image - Maximum process for downloading of inline image. The default is 4. + Maximum # of processes for downloading inline images. The default is 4. 1 to 8 can be set. ext_image_viewer Use external image viewer, when a command VIEW_IMAGE or @@ -75,8 +75,8 @@ Option panel image_scale Scale of image (%). The default value is 100(%). imgdisplay - External command to display image". The default value is "w3mimgdisplay". - See "Setting w3mimgdisplay". + External command to display image. The default value is "w3mimgdisplay". + See "Setting w3mimgdisplay." Required programs @@ -124,8 +124,8 @@ Setting w3mimgdisplay The default value for Linux framebuffer device is #000000 (black). When the color is specified as #RRGGBB, escape '#'. -anim - Maximum number of frames for animation. It means without limit - if the number is 0. Negative value count backward from the end + Maximum number of frames for animation. It will run everything + if the number is 0. Negative values count backward from the end of the frames. The default value is 100. -margin Margin of an area to clear an image. The default value is 0. @@ -135,13 +135,13 @@ Setting w3mimgdisplay Notice If you want to see GIF animation, please hit a suitable key, such - as 'h', 'l', etc., repeatedly, because a frame is rewritten + as 'h', 'l', etc., repeatedly, because a new frame is only requested according to the re-drawing demand from w3m. Some code in w3mimg/fb/fb.c was originally written by Mr. Yamasaki. http://www.sainet.or.jp/~yamasaki/download/fb-sample.tar.gz - On Windows, we check the behaver on standard console, Cygwin rxvt + On Windows, we check the behavior on standard console, Cygwin rxvt and PuTTY. diff --git a/doc/README.m17n b/doc/README.m17n index c064d76..da5408b 100644 --- a/doc/README.m17n +++ b/doc/README.m17n @@ -49,7 +49,7 @@ Supported encoding schemes (character set) * Thai TIS-620 (ISO-8859-11), CP874 * Other - US_ASCII, ISO-8859-1 10, 13 15, + US_ASCII, ISO-8859-1 - 10, 13 - 15, KOI8-R, KOI8-U, NeXT, CP437, CP737, CP775, CP850, CP852, CP855, CP856, CP857, CP860, CP861, CP862, CP863, CP864, CP865, CP866, CP869, CP1006, CP1250, CP1251, CP1252, CP1253, CP1254, CP1255, CP1256, CP1257 diff --git a/doc/README.pre_form b/doc/README.pre_form index 972ef90..dad62f8 100644 --- a/doc/README.pre_form +++ b/doc/README.pre_form @@ -1,12 +1,12 @@ -pre_form: Feature to configure form parameters when opening specific site. +pre_form: Feature to pre-fill form parameters when opening a specific site. -It would be convinient for sites where you often visit, but it may introduce -some security issues. Be careful to use this feature, especially `submit' +It is convenient for sites that you visit often, but it may introduce +some security issues. Be careful when using this feature, especially `submit' params described below. Default configuration file for pre_form is ~/.w3m/pre_form. -Syntax as follows: +The syntax of entries in the configuration file is as follows: url |// form [] @@ -23,21 +23,21 @@ textarea : /textarea -If is set, form which has matched attributes +If is set, a form which has matched attributes will be configured by this pre_form. -The line begining with text, file, passwd, select, textarea means that +A line beginning with text, file, passwd, select, textarea means that it will set value to in input, select or textarea element which name attribute matches with . -The line beginning with checkbox, radio means that it will check +A line beginning with checkbox, radio means that it will check input element which name and value attribute matches with and -respectively. If is 0, no, or off, disable check of the checkbox. +respectively. If is 0, no, or off, the checkbox will be unchecked. -The line beginning with submit or image means that it will submit input -element which name attribute matches with (and value attribute -matches with ), or submit last element if no - specified. +A line beginning with submit or image means that it will submit input +element whose name attribute matches with (and value attribute +matches with ), or submit on the last element if no + was specified. You quote \, ' (single-quote) or " (double quote) as you do in shell. diff --git a/doc/README.siteconf b/doc/README.siteconf new file mode 100644 index 0000000..5eb2554 --- /dev/null +++ b/doc/README.siteconf @@ -0,0 +1,67 @@ +The siteconf: Site-specific preferences + +The siteconf consists of URL patterns and preferences associated to them. +You can improve "decode_url" feature by giving charsets of URLs site by site, +or bypass Google's redirector for performance and your privacy. + +The siteconf is read from ~/.w3m/siteconf by default. + +===== The syntax ===== + +url |//|m@@i [exact] +substitute_url "" +url_charset +no_referer_from on|off +no_referer_to on|off +user_agent "string" + +The last match wins. + +===== Examples ===== + +url "https://twitter.com/" +substitute_url "https://mobile.twitter.com/" + +This forwards the twitter.com to its mobile site. + +url "http://your.bookmark.net/" +no_referer_from on + +This prevents HTTP referers from being sent when you follow links +at the your.bookmark.net. + +url "http://www.google.com/url?" exact +substitute_url "file:///cgi-bin/your-redirector.cgi?" + +This forwards the Google's redirector to your local CGI. + +url /^http:\/\/[a-z]*\.wikipedia\.org\// +url_charset utf-8 + +When combinated with "decode_url" option turned on, links to +Wikipedia will be human-readable. + +url m@^https?://(.*\.)google\.com/@ +user_agent "Lynx/2.8.8dev.3 libwww-FM/2.14 SSL-MM/1.4.1" + +Tell Google we're actually Lynx. (So they send us a text-browser friendly +results page.) + +===== Regular expressions notes ===== + +Following expressions are all equivalent: + +/http:\/\/www\.example\.com\// +m/http:\/\/www\.example\.com\// +m@http://www\.example\.com/@ +m!http://www\.example\.com/! + +With a trailing 'i' modifier, you can specify a case-insensitive match. +For example, m@^http://www\.example\.com/abc/@i matches to: + +http://www.example.com/abc/ +http://www.example.com/Abc/ +http://www.example.com/ABC/ + +Hostnames, however, are always converted to lowercases before compared. + diff --git a/doc/README.sixel b/doc/README.sixel new file mode 100644 index 0000000..588afc4 --- /dev/null +++ b/doc/README.sixel @@ -0,0 +1,27 @@ +Sixel support of w3m + 2014/11/05 + K. Araki + +Introduction + + This is the extension for w3m to show inline images by sixel graphics. + +Requirements + + Install 'img2sixel' command provided by libsixel project. + (https://github.com/saitoha/libsixel) + +Build + + $ ./configure --enable-image ... + $ make + $ make install + +Usage + + $ w3m -sixel http://... + + You can specify options of 'img2sixel' command by "W3M_IMG2SIXEL" + environmental variable. + + $ W3M_IMG2SIXEL="img2sixel -d atkinson" w3m -sixel http://... diff --git a/doc/README.tab b/doc/README.tab index 8e98e1c..f237f70 100644 --- a/doc/README.tab +++ b/doc/README.tab @@ -39,7 +39,7 @@ Options: open_tab_blank ... open new tab if target is _blank or _new default: OFF close_tab_back ... close the tab when you back from last buffer in the tab - default: OFF (= Can't back...) + default: OFF (= Can't go back...) diff --git a/doc/keymap.default b/doc/keymap.default index 0ecf14f..174e4ed 100644 --- a/doc/keymap.default +++ b/doc/keymap.default @@ -11,6 +11,7 @@ # Left : LEFT, ^[[D keymap C-@ MARK +keymap C-_ GOTO_HOME keymap C-a LINE_BEGIN keymap C-b MOVE_LEFT keymap C-e LINE_END diff --git a/doc/keymap.lynx b/doc/keymap.lynx index 869c716..e4085c8 100644 --- a/doc/keymap.lynx +++ b/doc/keymap.lynx @@ -46,7 +46,7 @@ keymap - PREV_PAGE keymap . RIGHT keymap / SEARCH keymap : MARK_URL -keymap ; MARK_WORD +keymap ";" MARK_WORD keymap < SHIFT_LEFT keymap = INFO keymap > SHIFT_RIGHT diff --git a/doc/menu.submenu b/doc/menu.submenu index e55193d..e837f46 100644 --- a/doc/menu.submenu +++ b/doc/menu.submenu @@ -39,6 +39,6 @@ menu Link end menu Bookmark - func "Read bookmark (b)" BOOKMARK "bB" + func "View bookmarks (b)" BOOKMARK "bB" func "Add page to bookmark(a)" ADD_BOOKMARK "aA" end diff --git a/doc/w3m.1 b/doc/w3m.1 index 8f071c6..90488f3 100644 --- a/doc/w3m.1 +++ b/doc/w3m.1 @@ -1,13 +1,10 @@ .nr N -1 .nr D 5 -.TH W3M 1 Local -.UC 4 +.TH W3M 1 "2016-08-06" "w3m 0.5.3" .SH NAME -w3m \- a text based Web browser and pager +w3m \- a text based web browser and pager .SH SYNOPSIS -.B w3m -[options] [URL or filename] -.PP +w3m [OPTION]... [ \fIfile\fP | \fIURL\fP ]... .SH DESCRIPTION .\" This defines appropriate quote strings for nroff and troff .ds lq \&" @@ -17,234 +14,283 @@ w3m \- a text based Web browser and pager .\" Just in case these number registers aren't set yet... .if \nN==0 .nr N 10 .if \nD==0 .nr D 5 -.I -w3m -is a World Wide Web (WWW) text based client. It has English and -Japanese help files and an option menu and can be configured to -use either language. It will display hypertext markup language -(HTML) documents containing links to files residing on the local -system, as well as files residing on remote systems. It can -display HTML tables and frames. -In addition, it can be used as a "pager" in much the same manner -as "more" or "less". -Current versions of -.I -w3m -run on -Unix (Solaris, SunOS, HP-UX, Linux, FreeBSD, and EWS4800) -and on -Microsoft Windows 9x/NT. -.PP + +\fIw3m\fP is a text based browser which can display local or remote +web pages as well as other documents. It is able to process HTML +tables and frames but it ignores JavaScript and Cascading Style +Sheets. \fIw3m\fP can also serve as a pager for text files named as +arguments or passed on standard input, and as a general purpose +directory browser. + +\fIw3m\fP organizes its content in buffers or tabs, allowing easy +navigation between them. With the w3m-img extension installed, \fIw3m\fP can +display inline graphics in web pages. And whenever \fIw3m\fP's HTML +rendering capabilities do not meet your needs, the target URL can be +handed over to a graphical browser with a single command. + +For help with runtime options, press \(lqH\(rq while running \fIw3m\fP. + +.SH ARGUMENTS + +When given one or more command line arguments, \fIw3m\fP will handle +targets according to content type. For web, \fIw3m\fP gets this +information from HTTP headers; for relative or absolute file system +paths, it relies on filenames. + +With no argument, \fIw3m\fP expects data from standard input and +assumes \(lqtext/plain\(rq unless another MIME type is given by the user. + +If provided with no target and no fallback target (see for instance +option \fB\-v\fP below), \fIw3m\fP will exit with usage information. .SH OPTIONS -At start up, \fIw3m\fR will load any local -file or remote URL specified at the command -line. For help with runtime options, press \fB"H"\fR -while running \fIw3m\fR. -Command line options are: -.PP +Command line options are introduced with a single \(lq\-\(rq character and +may take an argument. +.SS General options .TP -.B -t tab -set tab width +\fB\-B\fP +with no other target defined, use the bookmark page for startup .TP -.B -r -ignore backspace effect -.TP -.B -l line -# of preserved line (default 10000) -.TP -.B -I charset -document charset -.TP -.B -O charset -display/output charset +\fB\-M\fP +monochrome display .TP -.B -B -load bookmark +\fB\-no-mouse\fP +deactivate mouse support .TP -.B -bookmark file -specify bookmark file +\fB\-num\fP +display each line's number .TP -.B -T type -specify content-type +\fB\-N\fP +distribute multiple command line arguments to tabs. By default, a +stack of buffers is used +.TP +\fB\-ppc \fInum\fR +width of \fInum\fR pixels per character. Range of 4.0 to 32.0, default 8.0. +Larger values will make tables narrower. (Implementation not verified) .TP -.B -m -internet message mode +\fB\-ppl \fInum\fR +height of \fInum\fR pixels per line. Range of 4.0 to 64.0. (Implementation not verified) .TP -.B -v -visual startup mode +\fB\-title\fP, \fB\-title=TERM\fP +use the buffer name as terminal title string. With specified TERM, +this sets the title configuration style accordingly .TP -.B -M -monochrome display +\fB\-v\fP +with no other target defined, welcome users with a built-in page .TP -.B -N -open URL of command line on each new tab +\fB\-W\fP +toggle wrapping mode in searches .TP -.B -F -automatically render frame +\fB\-X\fP +do not initialize/deinitialize the terminal .TP -.B -dump -dump formatted page into stdout +\fB+\fInum\fR +go to line \fInum\fR; only effective for \fInum\fR larger than the number of lines in the terminal +.SS Browser options .TP -.B -cols width -specify column width (used with -dump) +\fB\-cols \fInum\fR +with stdout as destination; HTML is rendered to lines of \fInum\fR characters .TP -.B -ppc count -specify the number of pixels per character (4.0...32.0). -Larger values will make tables narrower. [default 8.0] +\fB\-cookie\fP, \fB\-no-cookie\fP +use stored cookies and accept new ones, or do neither .TP -.B -ppl count -specify the number of pixels per line (4.0...64.0) +\fB\-F\fP +render frames .TP -.B -dump_source -dump page source into stdout +\fB\-graph\fP, \fB\-no-graph\fP +use or do not use graphic characters for drawing HTML table and frame borders .TP -.B -dump_head -dump response of HEAD request into stdout +\fB\-header \fIstring\fR +append \fIstring\fR to the HTTP(S) request. Expected to match the header syntax \f(CWVariable: Value\fP .TP -.B -dump_both -dump HEAD and source into stdout +\fB\-m\fP +Render the body of Usenet messages according to the header \(lqContent-type\(rq .TP -.B -dump_extra -dump HEAD, source, and extra information into stdout +\fB\-no-proxy\fP +do not use proxy .TP -.B -post file -use POST method with file content +\fB\-post \fIfile\fR +use POST method to upload data defined in \fIfile\fR. The syntax to be used +is \f(CWvar1=value1[&var2=value2]...\fP .TP -.B -header string -insert string as a header +\fB\-4\fP +IPv4 only. Corresponds to dns_order=4 in configuration files .TP -.B + -goto line +\fB\-6\fP +IPv6 only. Corresponds to dns_order=6 in configuration files +.SS Text pager options .TP -.B -num -show line number +\fB\-l \fInum\fR +number of lines preserved internally when receiving plain text from +stdin (default 10,000) .TP -.B -no-proxy -don't use proxy +\fB\-r\fP +use caret notation to display special escape characters (such +as ANSI escapes or nroff-style backspaces for bold and underlined +characters) instead of processing them .TP -.B -4 -IPv4 only (-o dns_order=4) +\fB\-s\fP +squeeze multiple blank lines into one .TP -.B -6 -IPv6 only (-o dns_order=6) +\fB\-t\fP \fInum\fP +set tab width to \fInum\fR columns. No effect on stdout +.SS Data type/encoding options .TP -.B -no-mouse -don't use mouse +\fB\-I \fIcharset\fR +user defined character encoding of input data .TP -.B -cookie -use cookie. +\fB\-O \fIcharset\fR +user defined character encoding of output data .TP -.B -no-cookie -don't use cookie +\fB\-T \fItype\fR +explicit characterization of input data by MIME type +.SS Options for data output, followed by immediate exit .TP -.B -graph -use graphic character +\fB\-dump\fP +dump rendered page into stdout. Set implicitly when output is directed +to a file or pipe .TP -.B -no-graph -don't use graphic character +\fB\-dump_source\fP +dump the page's source code into stdout .TP -.B -S -squeeze multiple blank lines +\fB\-dump_head\fP +dump response of a HEAD request for a URL into stdout .TP -.B -W -toggle wrap search mode +\fB\-dump_both\fP +dump HEAD, and source code for a URL into stdout .TP -.B -X -don't use termcap init/deinit +\fB\-dump_extra\fP +dump HEAD, source code, and extra information for a URL into stdout .TP -.B -title [=TERM] -set buffer name to terminal title string. -If TERM is specified, use the TERM style title configuration. +\fB\-help\fP +show a summary of compiled-in features and command line options .TP -.B -o opt=value -assign value to config option +\fB\-show-option\fP +show all available configuration options .TP -.B -show-option -show all available config option +\fB\-version\fP +show the version of \fIw3m\fP +.SS Options for overriding default settings and resources .TP -.B -config file -specify config file +\fB\-bookmark \fIfile\fR +use \fIfile\fR instead of the default bookmark.html file .TP -.B -help -show usage +\fB\-config \fIfile\fR +use \fIfile\fR instead of the default configuration file .TP -.B -version -show w3m version +\fB\-debug\fP +DO NOT USE .TP -.B -reqlog -write request logfile +\fB\-o \fIoption=value\fR +modify one configuration item with an explicitly given value; without \fIoption=value\fR, equivalent to \fB-show-option\fR .TP -.B -debug -DO NOT USE +\fB\-reqlog\fP +log headers of HTTP communication in file \f(CW~/.w3m/request.log\fP .SH EXAMPLES +.SS Pager-like usage +.TP +Combine snippets of HTML code and preview the page +.EX +$ cat header.html footer.html | w3m -T text/html +.EE +.TP +Compare two files using tabs +.EX +$ w3m -N config.old config +.EE +.SS Browser-like usage +.TP +Display web content in monochrome terminal +.EX +$ w3m -M http://w3m.sourceforge.net +.EE +.TP +Display embedded graphics +.EX +$ w3m -o auto_image=TRUE http://w3m.sourceforge.net +.EE +.TP +Display content from Usenet +.EX +$ w3m -m nntp://news.aioe.org/comp.os.linux.networking +.EE +.TP +Upload data for a URL using the POST method +.EX +$ w3m -post - http://example.com/form.php <<<'a=0&b=1' +.EE +.SS Filter-like usage +.TP +Convert an HTML file to plain text with a defined line length +.EX +$ w3m -cols 40 foo.html > foo.txt +.EE +.TP +Output the bookmarks page as text with an appended list of links +.EX +$ w3m -B -o display_link_number=1 > out.txt +.EE +.TP +Conversion of file format and character encoding +.EX +$ w3m -T text/html -I EUC-JP -O UTF-8 < foo.html > foo.txt +.EE +.SS Start with no input +.TP +Welcome users with a built-in page +.EX +$ w3m -v +.EE +.\".SH Errors +.SH ENVIRONMENT +\fIw3m\fP recognises the environment variable WWW_HOME as defining a +fallback target for use if it is invoked without one. +.SH FILES .TP -To use w3m as a pager: -.br -$ ls | w3m -.br -.TP -To use w3m to translate HTML files: -.br -$ cat foo.html | w3m -T text/html +\f(CW~/.w3m/bookmark.html\fP +default bookmark file .TP -or -.br -$ cat foo.html | w3m -dump -T text/html >foo.txt -.SH FILES +\f(CW~/.w3m/config\fP +user defined configuration file; overrides \f(CW/etc/w3m/config\fP .TP -.I ${HOME}/.w3m/config -configuration file +\f(CW~/.w3m/cookie\fP +cookie jar; written on exit, read on launch .TP -.I ${HOME}/.w3m/keymap -key binding configuration file -.\" .TP -.\" .I ${HOME}/.w3m/menu -.\" ??? +\f(CW~/.w3m/history\fP +browser history - visited files and URLs .TP -.I ${HOME}/.w3m/mouse -mouse configuration file +\f(CW~/.w3m/keymap\fP +user defined key bindings; overrides default key bindings .TP -.I ${HOME}/.w3m/cookie -cookie file +\f(CW~/.w3m/mailcap\fP +external viewer configuration file .TP -.I ${HOME}/.w3m/history -history file +\f(CW~/.w3m/menu\fP +user defined menu; overrides default menu .TP -.I ${HOME}/.w3m/passwd -passowrd and username file +\f(CW~/.w3m/mime.types\fP +MIME types file .TP -.I ${HOME}/.w3m/pre_form -form parameters file +\f(CW~/.w3m/mouse\fP +user defined mouse settings .TP -.I ${HOME}/.w3m/mailcap -external viewer configuration file +\f(CW~/.w3m/passwd\fP +password and username file .TP -.I ${HOME}/.w3m/mime.types -MIME types file +\f(CW~/.w3m/pre_form\fP +contains predefined values to fill recurrent HTML forms .\" .TP -.\" .I ${HOME}/.w3m/urimethodmap +.\" .I $~/.w3m/urimethodmap .\" ??? -.SH NOTES -This is the -.I -w3m -0.5.3 Release. -.PP -Please see the MANUAL.html file distributed with w3m for -more detailed documentation. - -Additional information about -.I -w3m -may be found on its Japanese language Web site located at: - http://w3m.sourceforge.net/index.ja.html -.br -or on its English version of the site at: - http://w3m.sourceforge.net/index.en.html +.SH SEE ALSO +README and example files are to be found in the doc directory of your \fIw3m\fP installation. Recent information about \fIw3m\fP may be found on +.UR http://w3m.sourceforge.net +the project's web pages at +.UE .SH ACKNOWLEDGMENTS -.I -w3m -has incorporated code from several sources. +\fIw3m\fP has incorporated code from several sources. Users have contributed patches and suggestions over time. .SH AUTHOR -Akinori ITO +.UR aito@fw.ipsj.or.jp +Akinori ITO +.UE + diff --git a/entity.c b/entity.c index fdd8f64..45dc95e 100644 --- a/entity.c +++ b/entity.c @@ -44,6 +44,8 @@ conv_entity(unsigned int c) return " "; if (c == 0xa0) return NBSP; + if (c == 0xad) /* SOFT HYPHEN */ + return ""; if (c < 0x100) { /* Latin1 (ISO 8859-1) */ if (UseAltEntity) return alt_latin1[c - 0xa0]; diff --git a/entity.tab b/entity.tab index 130ae2d..d481312 100644 --- a/entity.tab +++ b/entity.tab @@ -7,6 +7,8 @@ amp 0x26 AMP 0x26 quot 0x22 QUOT 0x22 +apos 0x27 +APOS 0x27 nbsp 0xA0 NBSP 0xA0 iexcl 0xA1 diff --git a/etc.c b/etc.c index 8fe1215..37c4f15 100644 --- a/etc.c +++ b/etc.c @@ -498,7 +498,7 @@ calcPosition(char *l, Lineprop *pr, int len, int pos, int bpos, int mode) static char *prevl = NULL; int i, j; - if (l == NULL || len == 0) + if (l == NULL || len == 0 || pos < 0) return bpos; if (l == prevl && mode == CP_AUTO) { if (pos <= len) @@ -1365,7 +1365,13 @@ setup_child(int child, int i, int f) if (!child) SETPGRP(); #endif /* __MINGW32_VERSION */ + /* + * I don't know why but close_tty() sometimes interrupts loadGeneralFile() in loadImage() + * and corrupt image data can be cached in ~/.w3m. + */ +#if 0 close_tty(); +#endif close_all_fds_except(i, f); QuietMessage = TRUE; fmInitialized = FALSE; diff --git a/file.c b/file.c index 567d41e..0333e9a 100644 --- a/file.c +++ b/file.c @@ -26,6 +26,8 @@ #define min(a,b) ((a) > (b) ? (b) : (a)) #endif /* not min */ +#define MAX_INPUT_SIZE 80 /* TODO - max should be screen line length */ + static int frame_source = 0; static char *guess_filename(char *file); @@ -47,11 +49,11 @@ static JMP_BUF AbortLoading; static struct table *tables[MAX_TABLE]; static struct table_mode table_mode[MAX_TABLE]; -#ifdef USE_IMAGE +#if defined(USE_M17N) || defined(USE_IMAGE) static ParsedURL *cur_baseURL = NULL; -#ifdef USE_M17N -static char cur_document_charset; #endif +#ifdef USE_M17N +static wc_ces cur_document_charset = 0; #endif static Str cur_title; @@ -67,7 +69,7 @@ static int cur_status; #ifdef MENU_SELECT /* menu based -Section: -Keyword: - +Manual: +Section: +Keyword: + @@ -126,12 +131,14 @@ while() { s/\&/\&/g; s/\/\>/g; + # non ASCII UTF-8 codepoint + my $utf8="[\300-\337][\200-\277]|[\340-\357][\200-\277]{2}|[\360-\367][\200-\277]{3}|[\370-\373][\200-\277]{4}|[\374\375][\200-\277]{5}"; - s@([\200-\377].)(\010{1,2}\1)+@$1@g; + s@($utf8)(\010\1)+@$1@g; s@(\&\w+;|.)(\010\1)+@$1@g; - s@__\010{1,2}((\)?[\200-\377].(\)?)@$1@g; + s@_\010((\)?($utf8)(\)?)@$1@g; s@_\010((\)?(\&\w+\;|.)(\)?)@$1@g; - s@((\)?[\200-\377].(\)?)\010{1,2}__@$1@g; + s@((\)?($utf8)(\)?)\010_@$1@g; s@((\)?(\&\w+\;|.)(\)?)\010_@$1@g; s@.\010(.)@$1@g; @@ -156,7 +163,7 @@ EOF } s@(http|ftp)://[\w.\-/~]+[\w/]@$&@g; - s@(\W)(mailto:)?(\w[\w.\-]*\@\w[\w.\-]*\.[\w.\-]*\w)@$1$2$3@g; + s@\b(mailto:|)(\w[\w.\-]*\@\w[\w.\-]*\.[\w.\-]*\w)@$1$2@g; s@(\W)(\~?/[\w.][\w.\-/~]*)@$1 . &file_ref($2)@ge; s@(include(<\/?[bu]\>|\s)*\<)([\w.\-/]+)@$1 . &include_ref($3)@ge; if ($prev && m@^\s*(\<[bu]\>)*(\w[\w.\-]*)(\)*(\([\dm]\w*\))@) { @@ -220,7 +227,7 @@ sub is_command { local($p); (! -d && -x) || return 0; - if (! defined(%PATH)) { + if (! %PATH) { for $p (split(":", $ENV{'PATH'})) { $p =~ s@/+$@@; $PATH{$p} = 1; diff --git a/symbol.c b/symbol.c index 50475ae..c047c56 100644 --- a/symbol.c +++ b/symbol.c @@ -176,10 +176,10 @@ push_symbol(Str str, char symbol, int width, int n) #ifdef USE_M17N if (width == 2) - p = alt2_symbol[(int)symbol]; + p = alt2_symbol[(unsigned char)symbol % N_SYMBOL]; else #endif - p = alt_symbol[(int)symbol]; + p = alt_symbol[(unsigned char)symbol % N_SYMBOL]; for (i = 0; i < 2 && *p; i++, p++) buf[i] = (*p == ' ') ? NBSP_CODE : *p; diff --git a/table.c b/table.c index e1243ff..eb5c9ba 100644 --- a/table.c +++ b/table.c @@ -188,7 +188,7 @@ dv2sv(double *dv, short *iv, int size) indexarray = NewAtom_N(short, size); edv = NewAtom_N(double, size); for (i = 0; i < size; i++) { - iv[i] = ceil(dv[i]); + iv[i] = (short) ceil(dv[i]); edv[i] = (double)iv[i] - dv[i]; } @@ -205,7 +205,7 @@ dv2sv(double *dv, short *iv, int size) indexarray[i] = k; } iw = min((int)(w + 0.5), size); - if (iw == 0) + if (iw <= 1) return; x = edv[(int)indexarray[iw - 1]]; for (i = 0; i < size; i++) { @@ -429,7 +429,6 @@ visible_length(char *str) char *t, *r2; int amp_len = 0; - t = str; while (*str) { prev_status = status; if (next_status(*str, &status)) { @@ -761,7 +760,7 @@ do_refill(struct table *tbl, int row, int col, int maxlimit) struct parsed_tag *tag; if ((tag = parse_tag(&p, TRUE)) != NULL) parsedtag_get_value(tag, ATTR_TID, &id); - if (id >= 0 && id < tbl->ntable) { + if (id >= 0 && id < tbl->ntable && tbl->tables[id].ptr) { int alignment; TextLineListItem *ti; struct table *t = tbl->tables[id].ptr; @@ -961,7 +960,7 @@ set_integered_width(struct table *t, double *dwidth, short *iwidth) for (step = 0; step < 2; step++) { for (i = 0; i <= t->maxcol; i += n) { int nn; - char *idx; + short *idx; double nsum; if (sum < 0.5) return; @@ -982,7 +981,7 @@ set_integered_width(struct table *t, double *dwidth, short *iwidth) (double)rulewidth - mod[ii] > 0.5) fixed[ii] = 1; } - idx = NewAtom_N(char, n); + idx = NewAtom_N(short, n); for (k = 0; k < cell->maxcell; k++) { int kk, w, width, m; j = cell->index[k]; @@ -1624,6 +1623,15 @@ get_table_width(struct table *t, short *orgwidth, short *cellwidth, int flag) #define fixed_table_width(t)\ (get_table_width(t,t->fixed_width,t->cell.fixed_width,CHECK_MINIMUM)) +#define MAX_COTABLE_LEVEL 100 +static int cotable_level; + +void +initRenderTable(void) +{ + cotable_level = 0; +} + void renderCoTable(struct table *tbl, int maxlimit) { @@ -1634,8 +1642,14 @@ renderCoTable(struct table *tbl, int maxlimit) int i, col, row; int indent, maxwidth; + if (cotable_level >= MAX_COTABLE_LEVEL) + return; /* workaround to prevent infinite recursion */ + cotable_level++; + for (i = 0; i < tbl->ntable; i++) { t = tbl->tables[i].ptr; + if (t == NULL) + continue; col = tbl->tables[i].col; row = tbl->tables[i].row; indent = tbl->tables[i].indent; @@ -1691,7 +1705,7 @@ renderTable(struct table *t, int max_width, struct html_feed_environ *h_env) { int i, j, w, r, h; Str renderbuf; - short new_tabwidth[MAXCOL]; + short new_tabwidth[MAXCOL] = { 0 }; #ifdef MATRIX int itr; VEC *newwidth; @@ -1724,6 +1738,10 @@ renderTable(struct table *t, int max_width, struct html_feed_environ *h_env) if (max_width < rulewidth) max_width = rulewidth; +#define MAX_TABWIDTH 10000 + if (max_width > MAX_TABWIDTH) + max_width = MAX_TABWIDTH; + check_maximum_width(t); #ifdef MATRIX @@ -2272,7 +2290,8 @@ skip_space(struct table *t, char *line, struct table_linfo *linfo, } if (s > 0) { #ifdef USE_M17N - if (ctype == PC_KANJI1 && prev_ctype == PC_KANJI1) + if (!SimplePreserveSpace && + ctype == PC_KANJI1 && prev_ctype == PC_KANJI1) skip += s; else #endif @@ -2323,6 +2342,8 @@ feed_table_block_tag(struct table *tbl, int offset; if (mode->indent_level <= 0 && indent == -1) return; + if (mode->indent_level >= CHAR_MAX && indent == 1) + return; setwidth(tbl, mode); feed_table_inline_tag(tbl, line, mode, -1); clearcontentssize(tbl, mode); @@ -2336,10 +2357,14 @@ feed_table_block_tag(struct table *tbl, if (mode->indent_level < MAX_INDENT_LEVEL) tbl->indent -= INDENT_INCR; } + if (tbl->indent < 0) + tbl->indent = 0; offset = tbl->indent; if (cmd == HTML_DT) { if (mode->indent_level > 0 && mode->indent_level <= MAX_INDENT_LEVEL) offset -= INDENT_INCR; + if (offset < 0) + offset = 0; } if (tbl->indent > 0) { check_minimum0(tbl, 0); @@ -2546,8 +2571,10 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, } } #ifdef ID_EXT - if (parsedtag_get_value(tag, ATTR_ID, &p)) + if (parsedtag_get_value(tag, ATTR_ID, &p)) { + check_row(tbl, tbl->row); tbl->tridvalue[tbl->row] = Strnew_charp(p); + } #endif /* ID_EXT */ tbl->trattr = align | valign; break; @@ -2572,7 +2599,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, } tbl->col++; check_row(tbl, tbl->row); - while (tbl->tabattr[tbl->row][tbl->col]) { + while (tbl->col < MAXCOL && tbl->tabattr[tbl->row][tbl->col]) { tbl->col++; } if (tbl->col > MAXCOL - 1) { @@ -2600,12 +2627,16 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, if ((tbl->row + rowspan) >= tbl->max_rowsize) check_row(tbl, tbl->row + rowspan); } + if (rowspan < 1) + rowspan = 1; if (parsedtag_get_value(tag, ATTR_COLSPAN, &colspan)) { if ((tbl->col + colspan) >= MAXCOL) { /* Can't expand column */ colspan = MAXCOL - tbl->col; } } + if (colspan < 1) + colspan = 1; if (parsedtag_get_value(tag, ATTR_ALIGN, &i)) { switch (i) { case ALIGN_LEFT: @@ -2878,6 +2909,14 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, tmp = process_input(tag); feed_table1(tbl, tmp, mode, width); break; + case HTML_BUTTON: + tmp = process_button(tag); + feed_table1(tbl, tmp, mode, width); + break; + case HTML_N_BUTTON: + tmp = process_n_button(); + feed_table1(tbl, tmp, mode, width); + break; case HTML_SELECT: tmp = process_select(tag); if (tmp) @@ -3010,7 +3049,6 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode, break; case HTML_TABLE_ALT: id = -1; - w = 0; parsedtag_get_value(tag, ATTR_TID, &id); if (id >= 0 && id < tbl->ntable) { struct table *tbl1 = tbl->tables[id].ptr; diff --git a/table.h b/table.h index 83b661f..fdcdef3 100644 --- a/table.h +++ b/table.h @@ -17,7 +17,7 @@ #define MAX_TABLE_N 20 /* maximum number of table in same level */ #define MAXROW 50 -#define MAXCOL 50 +#define MAXCOL 256 #define MAX_WIDTH 80 diff --git a/tagtable.tab b/tagtable.tab index f9b7b76..f5a2c30 100644 --- a/tagtable.tab +++ b/tagtable.tab @@ -176,6 +176,7 @@ bdo HTML_BDO big HTML_BIG /big HTML_N_BIG button HTML_BUTTON +/button HTML_N_BUTTON fieldset HTML_FIELDSET /fieldset HTML_N_FIELDSET iframe HTML_IFRAME diff --git a/terms.c b/terms.c index 7a3c987..a636ac0 100644 --- a/terms.c +++ b/terms.c @@ -12,6 +12,7 @@ #include #include "config.h" #include +#include #ifdef HAVE_SYS_SELECT_H #include #endif @@ -222,6 +223,7 @@ static void check_cygwin_console(void) { char *term = getenv("TERM"); + char *ctype; HANDLE hWnd; if (term == NULL) @@ -236,7 +238,9 @@ check_cygwin_console(void) isLocalConsole = 1; } } - if (strncmp(getenv("LANG"), "ja", 2) == 0) { + if (((ctype = getenv("LC_ALL")) || + (ctype = getenv("LC_CTYPE")) || + (ctype = getenv("LANG"))) && strncmp(ctype, "ja", 2) == 0) { isWinConsole = TERM_CYGWIN_RESERVE_IME; } #ifdef SUPPORT_WIN9X_CONSOLE_MBCS @@ -463,6 +467,262 @@ writestr(char *s) #define MOVE(line,column) writestr(tgoto(T_cm,column,line)); +#ifdef USE_IMAGE +void +put_image_osc5379(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int n_terminal_image) +{ + Str buf; + char *size ; + + if (w > 0 && h > 0) + size = Sprintf("%dx%d",w,h)->ptr; + else + size = ""; + + MOVE(y,x); + buf = Sprintf("\x1b]5379;show_picture %s %s %dx%d+%d+%d\x07",url,size,sw,sh,sx,sy); + writestr(buf->ptr); + MOVE(Currentbuf->cursorY,Currentbuf->cursorX); +} + +static void +save_gif(const char *path, u_char *header, size_t header_size, u_char *body, size_t body_size) +{ + int fd; + + if ((fd = open(path, O_WRONLY|O_CREAT, 0600)) >= 0) { + write(fd, header, header_size) ; + write(fd, body, body_size) ; + write(fd, "\x3b" , 1) ; + close(fd) ; + } +} + +static u_char * +skip_gif_header(u_char *p) +{ + /* Header */ + p += 10; + + if (*(p) & 0x80) { + p += (3 * (2 << ((*p) & 0x7))); + } + p += 3; + + return p; +} + +static Str +save_first_animation_frame(const char *path) +{ + int fd; + struct stat st; + u_char *header; + size_t header_size; + u_char *body; + u_char *p; + ssize_t len; + Str new_path; + + new_path = Strnew_charp(path); + Strcat_charp(new_path, "-1"); + if (stat(new_path->ptr, &st) == 0) { + return new_path; + } + + if ((fd = open( path, O_RDONLY)) < 0) { + return NULL; + } + + if (fstat( fd, &st) != 0 || ! (header = GC_malloc( st.st_size))){ + close( fd); + return NULL; + } + + len = read(fd, header, st.st_size); + close(fd); + + /* Header */ + + if (len != st.st_size || strncmp(header, "GIF89a", 6) != 0) { + return NULL; + } + + p = skip_gif_header(header); + header_size = p - header; + + /* Application Extension */ + if (p[0] == 0x21 && p[1] == 0xff) { + p += 19; + } + + /* Other blocks */ + body = NULL; + while (p + 2 < header + st.st_size) { + if (*(p++) == 0x21 && *(p++) == 0xf9 && *(p++) == 0x04) { + if( body) { + /* Graphic Control Extension */ + save_gif(new_path->ptr, header, header_size, body, p - 3 - body); + return new_path; + } + else { + /* skip the first frame. */ + } + body = p - 3; + } + } + + return NULL; +} + +void ttymode_set(int mode, int imode); +void ttymode_reset(int mode, int imode); + +void +put_image_sixel(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int n_terminal_image) +{ + pid_t pid; + int do_anim; + MySignalHandler(*volatile previntr) (SIGNAL_ARG); + MySignalHandler(*volatile prevquit) (SIGNAL_ARG); + MySignalHandler(*volatile prevstop) (SIGNAL_ARG); + + MOVE(y,x); + flush_tty(); + + do_anim = (n_terminal_image == 1 && x == 0 && y == 0 && sx == 0 && sy == 0); + + previntr = mySignal(SIGINT, SIG_IGN); + prevquit = mySignal(SIGQUIT, SIG_IGN); + prevstop = mySignal(SIGTSTP, SIG_IGN); + + if ((pid = fork()) == 0) { + char *env; + int n = 0; + char *argv[20]; + char digit[2][11+1]; + char clip[44+3+1]; + Str str_url; + + close(STDERR_FILENO); /* Don't output error message. */ + if (do_anim) { + writestr("\x1b[?80h"); + } + else if (!strstr(url, "://") && strcmp(url+strlen(url)-4, ".gif") == 0 && + (str_url = save_first_animation_frame(url))) { + url = str_url->ptr; + } + ttymode_set(ISIG, 0); + + if ((env = getenv("W3M_IMG2SIXEL"))) { + char *p; + env = Strnew_charp(env)->ptr; + while (n < 8 && (p = strchr(env, ' '))) { + *p = '\0'; + if (*env != '\0') { + argv[n++] = env; + } + env = p+1; + } + if (*env != '\0') { + argv[n++] = env; + } + } + else { + argv[n++] = "img2sixel"; + } + argv[n++] = "-l"; + argv[n++] = do_anim ? "auto" : "disable"; + argv[n++] = "-w"; + sprintf(digit[0], "%d", w*pixel_per_char_i); + argv[n++] = digit[0]; + argv[n++] = "-h"; + sprintf(digit[1], "%d", h*pixel_per_line_i); + argv[n++] = digit[1]; + argv[n++] = "-c"; + sprintf(clip, "%dx%d+%d+%d", sw*pixel_per_char_i, sh*pixel_per_line_i, + sx*pixel_per_char_i, sy*pixel_per_line_i); + argv[n++] = clip; + argv[n++] = url; + if (getenv("TERM") && strcmp(getenv("TERM"), "screen") == 0 && + (!getenv("SCREEN_VARIANT") || strcmp(getenv("SCREEN_VARIANT"), "sixel") != 0)) { + argv[n++] = "-P"; + } + argv[n++] = NULL; + execvp(argv[0],argv); + exit(0); + } + else if (pid > 0) { + int status; + waitpid(pid, &status, 0); + ttymode_reset(ISIG, 0); + mySignal(SIGINT, previntr); + mySignal(SIGQUIT, prevquit); + mySignal(SIGTSTP, prevstop); + if (do_anim) { + writestr("\x1b[?80l"); + } + } + + MOVE(Currentbuf->cursorY,Currentbuf->cursorX); +} + +int +get_pixel_per_cell(int *ppc, int *ppl) +{ + fd_set rfd; + struct timeval tval; + char buf[100]; + char *p; + ssize_t len; + ssize_t left; + int wp,hp,wc,hc; + int i; + +#ifdef TIOCGWINSZ + struct winsize ws; + if (ioctl(tty, TIOCGWINSZ, &ws) == 0 && ws.ws_ypixel > 0 && ws.ws_row > 0 && + ws.ws_xpixel > 0 && ws.ws_col > 0) { + *ppc = ws.ws_xpixel / ws.ws_col; + *ppl = ws.ws_ypixel / ws.ws_row; + return 1; + } +#endif + + fputs("\x1b[14t\x1b[18t",ttyf); flush_tty(); + + p = buf; + left = sizeof(buf) - 1; + for (i = 0; i < 10; i++) { + tval.tv_usec = 200000; /* 0.2 sec * 10 */ + tval.tv_sec = 0; + FD_ZERO(&rfd); + FD_SET(tty,&rfd); + if (select(tty+1,&rfd,NULL,NULL,&tval) <= 0 || ! FD_ISSET(tty,&rfd)) + continue; + + if ((len = read(tty,p,left)) <= 0) + continue; + p[len] = '\0'; + + if (sscanf(buf,"\x1b[4;%d;%dt\x1b[8;%d;%dt",&hp,&wp,&hc,&wc) == 4) { + if (wp > 0 && wc > 0 && hp > 0 && hc > 0) { + *ppc = wp / wc; + *ppl = hp / hc; + return 1; + } + else { + return 0; + } + } + p += len; + left -= len; + } + + return 0; +} +#endif /* USE_IMAGE */ + #ifdef USE_MOUSE #define W3M_TERM_INFO(name, title, mouse) name, title, mouse #define NEED_XTERM_ON (1) @@ -563,7 +823,7 @@ ttymode_set(int mode, int imode) while (TerminalSet(tty, &ioval) == -1) { if (errno == EINTR || errno == EAGAIN) continue; - printf("Error occured while set %x: errno=%d\n", mode, errno); + printf("Error occurred while set %x: errno=%d\n", mode, errno); reset_error_exit(SIGNAL_ARGLIST); } #endif @@ -584,7 +844,7 @@ ttymode_reset(int mode, int imode) while (TerminalSet(tty, &ioval) == -1) { if (errno == EINTR || errno == EAGAIN) continue; - printf("Error occured while reset %x: errno=%d\n", mode, errno); + printf("Error occurred while reset %x: errno=%d\n", mode, errno); reset_error_exit(SIGNAL_ARGLIST); } #endif /* __MINGW32_VERSION */ @@ -601,7 +861,7 @@ set_cc(int spec, int val) while (TerminalSet(tty, &ioval) == -1) { if (errno == EINTR || errno == EAGAIN) continue; - printf("Error occured: errno=%d\n", errno); + printf("Error occurred: errno=%d\n", errno); reset_error_exit(SIGNAL_ARGLIST); } } @@ -634,7 +894,8 @@ reset_tty(void) writestr(T_se); /* reset terminal */ flush_tty(); TerminalSet(tty, &d_ioval); - close_tty(); + if (tty != 2) + close_tty(); } static MySignalHandler @@ -953,7 +1214,6 @@ addch(char pc) { l_prop *pr; int dest, i; - short *dirty; #ifdef USE_M17N static Str tmp = NULL; char **p; @@ -975,7 +1235,6 @@ addch(char pc) return; p = ScreenImage[CurLine]->lineimage; pr = ScreenImage[CurLine]->lineprop; - dirty = &ScreenImage[CurLine]->isdirty; #ifndef USE_M17N /* Eliminate unprintables according to * iso-8859-*. @@ -1986,6 +2245,10 @@ skip_escseq(void) getch(); getch(); getch(); + } else if (is_xterm && c == '<') { + c = getch(); + while (IS_DIGIT(c) || c == ';') + c = getch(); } else #endif @@ -2019,7 +2282,7 @@ sleep_till_anykey(int sec, int purge) } er = TerminalSet(tty, &ioval); if (er == -1) { - printf("Error occured: errno=%d\n", errno); + printf("Error occurred: errno=%d\n", errno); reset_error_exit(SIGNAL_ARGLIST); } return ret; @@ -2027,8 +2290,8 @@ sleep_till_anykey(int sec, int purge) #ifdef USE_MOUSE -#define XTERM_ON {fputs("\033[?1001s\033[?1000h",ttyf); flush_tty();} -#define XTERM_OFF {fputs("\033[?1000l\033[?1001r",ttyf); flush_tty();} +#define XTERM_ON {fputs("\033[?1001s\033[?1000h\033[?1006h",ttyf); flush_tty();} +#define XTERM_OFF {fputs("\033[?1006l\033[?1000l\033[?1001r",ttyf); flush_tty();} #define CYGWIN_ON {fputs("\033[?1000h",ttyf); flush_tty();} #define CYGWIN_OFF {fputs("\033[?1000l",ttyf); flush_tty();} diff --git a/url.c b/url.c index ed6062e..a9e4108 100644 --- a/url.c +++ b/url.c @@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = { }; static void add_index_file(ParsedURL *pu, URLFile *uf); +static char * schemeNumToName(int scheme); /* #define HTTP_DEFAULT_FILE "/index.html" */ @@ -318,14 +319,19 @@ openSSLHandle(int sock, char *hostname, char **p_cert) #endif /* defined(USE_SSL_VERIFY) */ if (ssl_ctx == NULL) { int option; -#if SSLEAY_VERSION_NUMBER < 0x0800 +#if OPENSSL_VERSION_NUMBER < 0x0800 ssl_ctx = SSL_CTX_new(); X509_set_default_verify_paths(ssl_ctx->cert); #else /* SSLEAY_VERSION_NUMBER >= 0x0800 */ +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) SSLeay_add_ssl_algorithms(); SSL_load_error_strings(); +#else + OPENSSL_init_ssl(0, NULL); +#endif if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method()))) goto eend; + SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP"); option = SSL_OP_ALL; if (ssl_forbid_method) { if (strchr(ssl_forbid_method, '2')) @@ -336,8 +342,30 @@ openSSLHandle(int sock, char *hostname, char **p_cert) option |= SSL_OP_NO_TLSv1; if (strchr(ssl_forbid_method, 'T')) option |= SSL_OP_NO_TLSv1; + if (strchr(ssl_forbid_method, '4')) + option |= SSL_OP_NO_TLSv1; +#ifdef SSL_OP_NO_TLSv1_1 + if (strchr(ssl_forbid_method, '5')) + option |= SSL_OP_NO_TLSv1_1; +#endif +#ifdef SSL_OP_NO_TLSv1_2 + if (strchr(ssl_forbid_method, '6')) + option |= SSL_OP_NO_TLSv1_2; +#endif +#ifdef SSL_OP_NO_TLSv1_3 + if (strchr(ssl_forbid_method, '7')) + option |= SSL_OP_NO_TLSv1_3; +#endif } +#ifdef SSL_OP_NO_COMPRESSION + option |= SSL_OP_NO_COMPRESSION; +#endif SSL_CTX_set_options(ssl_ctx, option); + +#ifdef SSL_MODE_RELEASE_BUFFERS + SSL_CTX_set_mode (ssl_ctx, SSL_MODE_RELEASE_BUFFERS); +#endif + #ifdef USE_SSL_VERIFY /* derived from openssl-0.9.5/apps/s_{client,cb}.c */ #if 1 /* use SSL_get_verify_result() to verify cert */ @@ -444,6 +472,8 @@ baseURL(Buffer *buf) /* tag is defined in the document */ return buf->baseURL; } + else if (IS_EMPTY_PARSED_URL(&buf->currentURL)) + return NULL; else return &buf->currentURL; } @@ -638,16 +668,21 @@ openSocket(char *const hostname, #define COPYPATH_SPC_ALLOW 0 #define COPYPATH_SPC_IGNORE 1 #define COPYPATH_SPC_REPLACE 2 +#define COPYPATH_SPC_MASK 3 +#define COPYPATH_LOWERCASE 4 static char * copyPath(char *orgpath, int length, int option) { Str tmp = Strnew(); - while (*orgpath && length != 0) { - if (IS_SPACE(*orgpath)) { - switch (option) { + char ch; + while ((ch = *orgpath) != 0 && length != 0) { + if (option & COPYPATH_LOWERCASE) + ch = TOLOWER(ch); + if (IS_SPACE(ch)) { + switch (option & COPYPATH_SPC_MASK) { case COPYPATH_SPC_ALLOW: - Strcat_char(tmp, *orgpath); + Strcat_char(tmp, ch); break; case COPYPATH_SPC_IGNORE: /* do nothing */ @@ -658,7 +693,7 @@ copyPath(char *orgpath, int length, int option) } } else - Strcat_char(tmp, *orgpath); + Strcat_char(tmp, ch); orgpath++; length--; } @@ -668,22 +703,14 @@ copyPath(char *orgpath, int length, int option) void parseURL(char *url, ParsedURL *p_url, ParsedURL *current) { - char *p, *q; + char *p, *q, *qq; Str tmp; url = url_quote(url); /* quote 0x01-0x20, 0x7F-0xFF */ p = url; + copyParsedURL(p_url, NULL); p_url->scheme = SCM_MISSING; - p_url->port = 0; - p_url->user = NULL; - p_url->pass = NULL; - p_url->host = NULL; - p_url->is_nocache = 0; - p_url->file = NULL; - p_url->real_file = NULL; - p_url->query = NULL; - p_url->label = NULL; /* RFC1808: Relative Uniform Resource Locators * 4. Resolving Relative URLs @@ -694,7 +721,7 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current) goto do_label; } #if defined( __EMX__ ) || defined( __CYGWIN__ ) - if (!strncmp(url, "file://localhost/", 17)) { + if (!strncasecmp(url, "file://localhost/", 17)) { p_url->scheme = SCM_LOCAL; p += 17 - 1; url += 17 - 1; @@ -802,19 +829,20 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current) /* scheme://user:pass@host or * scheme://host:port */ - p_url->host = copyPath(q, p - q, COPYPATH_SPC_IGNORE); + qq = q; q = ++p; while (*p && strchr("@/?#", *p) == NULL) p++; if (*p == '@') { /* scheme://user:pass@... */ + p_url->user = copyPath(qq, q - 1 - qq, COPYPATH_SPC_IGNORE); p_url->pass = copyPath(q, p - q, COPYPATH_SPC_ALLOW); - q = ++p; - p_url->user = p_url->host; - p_url->host = NULL; + p++; goto analyze_url; } /* scheme://host:port/ */ + p_url->host = copyPath(qq, q - 1 - qq, + COPYPATH_SPC_IGNORE | COPYPATH_LOWERCASE); tmp = Strnew_charp_n(q, p - q); p_url->port = atoi(tmp->ptr); /* *p is one of ['\0', '/', '?', '#'] */ @@ -822,15 +850,19 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current) case '@': /* scheme://user@... */ p_url->user = copyPath(q, p - q, COPYPATH_SPC_IGNORE); - q = ++p; + p++; goto analyze_url; case '\0': /* scheme://host */ case '/': case '?': case '#': - p_url->host = copyPath(q, p - q, COPYPATH_SPC_IGNORE); - p_url->port = DefaultPort[p_url->scheme]; + p_url->host = copyPath(q, p - q, + COPYPATH_SPC_IGNORE | COPYPATH_LOWERCASE); + if (p_url->scheme != SCM_UNKNOWN) + p_url->port = DefaultPort[p_url->scheme]; + else + p_url->port = 0; break; } analyze_file: @@ -956,12 +988,16 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current) p_url->label = NULL; } -#define initParsedURL(p) bzero(p,sizeof(ParsedURL)) #define ALLOC_STR(s) ((s)==NULL?NULL:allocStr(s,-1)) void -copyParsedURL(ParsedURL *p, ParsedURL *q) +copyParsedURL(ParsedURL *p, const ParsedURL *q) { + if (q == NULL) { + memset(p, 0, sizeof(ParsedURL)); + p->scheme = SCM_UNKNOWN; + return; + } p->scheme = q->scheme; p->port = q->port; p->is_nocache = q->is_nocache; @@ -1279,17 +1315,36 @@ getURLScheme(char **url) return scheme; } +static char * +schemeNumToName(int scheme) +{ + int i; + + for (i = 0; schemetable[i].cmdname != NULL; i++) { + if (schemetable[i].cmd == scheme) + return schemetable[i].cmdname; + } + return NULL; +} + static char * otherinfo(ParsedURL *target, ParsedURL *current, char *referer) { Str s = Strnew(); + const int *no_referer_ptr; + int no_referer; + const char* url_user_agent = query_SCONF_USER_AGENT(target); - Strcat_charp(s, "User-Agent: "); - if (UserAgent == NULL || *UserAgent == '\0') - Strcat_charp(s, w3m_version); - else - Strcat_charp(s, UserAgent); - Strcat_charp(s, "\r\n"); + if (!override_user_agent) { + Strcat_charp(s, "User-Agent: "); + if (url_user_agent) + Strcat_charp(s, url_user_agent); + else if (UserAgent == NULL || *UserAgent == '\0') + Strcat_charp(s, w3m_version); + else + Strcat_charp(s, UserAgent); + Strcat_charp(s, "\r\n"); + } Strcat_m_charp(s, "Accept: ", AcceptMedia, "\r\n", NULL); Strcat_m_charp(s, "Accept-Encoding: ", AcceptEncoding, "\r\n", NULL); @@ -1306,7 +1361,12 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer) Strcat_charp(s, "Pragma: no-cache\r\n"); Strcat_charp(s, "Cache-control: no-cache\r\n"); } - if (!NoSendReferer) { + no_referer = NoSendReferer; + no_referer_ptr = query_SCONF_NO_REFERER_FROM(current); + no_referer = no_referer || (no_referer_ptr && *no_referer_ptr); + no_referer_ptr = query_SCONF_NO_REFERER_TO(target); + no_referer = no_referer || (no_referer_ptr && *no_referer_ptr); + if (!no_referer) { #ifdef USE_SSL if (current && current->scheme == SCM_HTTPS && target->scheme != SCM_HTTPS) { /* Don't send Referer: if https:// -> http:// */ @@ -1314,6 +1374,7 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer) else #endif if (referer == NULL && current && current->scheme != SCM_LOCAL && + current->scheme != SCM_LOCAL_CGI && (current->scheme != SCM_FTP || (current->user == NULL && current->pass == NULL))) { char *p = current->label; @@ -1384,7 +1445,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra) { Str tmp; TextListItem *i; - int seen_www_auth = 0; #ifdef USE_COOKIE Str cookie; #endif /* USE_COOKIE */ @@ -1400,7 +1460,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra) for (i = extra->first; i != NULL; i = i->next) { if (strncasecmp(i->ptr, "Authorization:", sizeof("Authorization:") - 1) == 0) { - seen_www_auth = 1; #ifdef USE_SSL if (hr->command == HR_COMMAND_CONNECT) continue; @@ -1430,20 +1489,20 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra) #endif /* USE_COOKIE */ if (hr->command == HR_COMMAND_POST) { if (hr->request->enctype == FORM_ENCTYPE_MULTIPART) { - Strcat_charp(tmp, "Content-type: multipart/form-data; boundary="); + Strcat_charp(tmp, "Content-Type: multipart/form-data; boundary="); Strcat_charp(tmp, hr->request->boundary); Strcat_charp(tmp, "\r\n"); Strcat(tmp, - Sprintf("Content-length: %ld\r\n", hr->request->length)); + Sprintf("Content-Length: %ld\r\n", hr->request->length)); Strcat_charp(tmp, "\r\n"); } else { if (!override_content_type) { Strcat_charp(tmp, - "Content-type: application/x-www-form-urlencoded\r\n"); + "Content-Type: application/x-www-form-urlencoded\r\n"); } Strcat(tmp, - Sprintf("Content-length: %ld\r\n", hr->request->length)); + Sprintf("Content-Length: %ld\r\n", hr->request->length)); if (header_string) Strcat(tmp, header_string); Strcat_charp(tmp, "\r\n"); @@ -1603,7 +1662,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(FTP_proxy_parsed.host, - schemetable[FTP_proxy_parsed.scheme].cmdname, + schemeNumToName(FTP_proxy_parsed.scheme), FTP_proxy_parsed.port); if (sock < 0) return uf; @@ -1645,15 +1704,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } else if (pu->scheme == SCM_HTTPS) { sock = openSocket(HTTPS_proxy_parsed.host, - schemetable[HTTPS_proxy_parsed.scheme]. - cmdname, HTTPS_proxy_parsed.port); + schemeNumToName(HTTPS_proxy_parsed.scheme), + HTTPS_proxy_parsed.port); sslh = NULL; } else { #endif /* USE_SSL */ sock = openSocket(HTTP_proxy_parsed.host, - schemetable[HTTP_proxy_parsed.scheme]. - cmdname, HTTP_proxy_parsed.port); + schemeNumToName(HTTP_proxy_parsed.scheme), + HTTP_proxy_parsed.port); #ifdef USE_SSL sslh = NULL; } @@ -1685,8 +1744,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, } } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) { *status = HTST_MISSING; return uf; @@ -1713,6 +1771,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, write(sock, tmp->ptr, tmp->length); if(w3m_reqlog){ FILE *ff = fopen(w3m_reqlog, "a"); + if (ff == NULL) + return uf; if (sslh) fputs("HTTPS: request via SSL\n", ff); else @@ -1735,6 +1795,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, write(sock, tmp->ptr, tmp->length); if(w3m_reqlog){ FILE *ff = fopen(w3m_reqlog, "a"); + if (ff == NULL) + return uf; fwrite(tmp->ptr, sizeof(char), tmp->length, ff); fclose(ff); } @@ -1750,7 +1812,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, pu->host != NULL && !check_no_proxy(pu->host)) { hr->flag |= HR_FLAG_PROXY; sock = openSocket(GOPHER_proxy_parsed.host, - schemetable[GOPHER_proxy_parsed.scheme].cmdname, + schemeNumToName(GOPHER_proxy_parsed.scheme), GOPHER_proxy_parsed.port); if (sock < 0) return uf; @@ -1758,8 +1820,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, tmp = HTTPrequest(pu, current, hr, extra_header); } else { - sock = openSocket(pu->host, - schemetable[pu->scheme].cmdname, pu->port); + sock = openSocket(pu->host, schemeNumToName(pu->scheme), pu->port); if (sock < 0) return uf; if (pu->file == NULL) @@ -2049,7 +2110,7 @@ filename_extension(char *path, int is_url) break; } if (*last_dot == '.') { - for (i = 1; last_dot[i] && i < 8; i++) { + for (i = 1; i < 8 && last_dot[i]; i++) { if (is_url && !IS_ALNUM(last_dot[i])) break; } @@ -2234,3 +2295,66 @@ schemeToProxy(int scheme) } return pu; } + +#ifdef USE_M17N +wc_ces +url_to_charset(const char *url, const ParsedURL *base, wc_ces doc_charset) +{ + const ParsedURL *pu; + ParsedURL pu_buf; + const wc_ces *csptr; + + if (url && *url && *url != '#') { + parseURL2((char *)url, &pu_buf, (ParsedURL *)base); + pu = &pu_buf; + } else { + pu = base; + } + if (pu && (pu->scheme == SCM_LOCAL || pu->scheme == SCM_LOCAL_CGI)) + return SystemCharset; + csptr = query_SCONF_URL_CHARSET(pu); + return (csptr && *csptr) ? *csptr : + doc_charset ? doc_charset : DocumentCharset; +} + +char * +url_encode(const char *url, const ParsedURL *base, wc_ces doc_charset) +{ + return url_quote_conv((char *)url, + url_to_charset(url, base, doc_charset)); +} + +#if 0 /* unused */ +char * +url_decode(const char *url, const ParsedURL *base, wc_ces doc_charset) +{ + if (!DecodeURL) + return (char *)url; + return url_unquote_conv((char *)url, + url_to_charset(url, base, doc_charset)); +} +#endif + +char * +url_decode2(const char *url, const Buffer *buf) +{ + wc_ces url_charset; + + if (!DecodeURL) + return (char *)url; + url_charset = buf ? + url_to_charset(url, baseURL((Buffer *)buf), buf->document_charset) : + url_to_charset(url, NULL, 0); + return url_unquote_conv((char *)url, url_charset); +} + +#else /* !defined(USE_M17N) */ + +char * +url_decode0(const char *url) +{ + if (!DecodeURL) + return (char *)url; + return url_unquote_conv((char *)url, 0); +} +#endif /* !defined(USE_M17N) */ diff --git a/version.c.in b/version.c.in index 31d30e4..ab25163 100644 --- a/version.c.in +++ b/version.c.in @@ -1,5 +1,5 @@ /* $Id: version.c.in,v 1.49 2012/05/22 09:45:56 inu Exp $ */ -#define CURRENT_VERSION "w3m/0.5.3+cvs" +#define CURRENT_VERSION "w3m/0.5.3+gitYYYYMMDD" #ifndef FM_H char *w3m_version = CURRENT_VERSION; diff --git a/w3m-doc/install.html.in b/w3m-doc/install.html.in index 8e27f03..610e4be 100644 --- a/w3m-doc/install.html.in +++ b/w3m-doc/install.html.in @@ -232,7 +232,7 @@
      DICT
      $B<-=q0z$-5!G=(B$B$rM-8z$K$7$^$9!#(B
      $BD4$Y$?$$C18l$K%+!<%=%k$r9g$o$;!"!H(BESC W$B!I$G(B w3mdict $B%3%^%s%I$r8F$S=P$7$^$9!#(B
      - w3mdict $B%3%^%s%I$O(B w3m $B$N%"!<%+%$%V$K$OF1:-$5$l$F$$$J$$$N$G!"<+?H$N4D6-$K9g$o$;$F:n@.$7$F$/$@$5$$!#(B
      + w3mdict $B%3%^%s%I$O<+?H$N4D6-$K9g$o$;$F:n@.$G$-$^$9!#(B
      $B$?$H$($P!"$b$C$H$b4JC1$JNc$H$7$F!"(Bman $B%3%^%s%I$K(B wrap $B$9$k>l9g!"0J2<$N$h$&$K$7$^$9!#(B
      % cat w3mdict
      diff --git a/w3m-doc/outline.html.in b/w3m-doc/outline.html.in index 60bda47..4ed2a59 100644 --- a/w3m-doc/outline.html.in +++ b/w3m-doc/outline.html.in @@ -146,8 +146,8 @@ w3m $B$N(Bmake$B;~$K;XDj$7$?%-! c $B8=%Z!<%8$N(B URL $B$rI=<((B = $B8=%I%-%e%a%s%H$N>pJs$rI=<((B F $B%U%l!<%`$rI=<($9$k(B - M $B8=%Z!<%8$r30It%V%i%&%6$GI=<($9$k(B(2M,3M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r8F$S$@$9(B) - ESC M $B%j%s%/@h$r30It%V%i%&%6$GI=<($9$k(B(2ESC M,3ESC M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r8F$S$@$9(B) + M $B8=%Z!<%8$r30It%V%i%&%6$GI=<($9$k(B(2M, 3M, ..., 9M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r8F$S$@$9(B) + ESC M $B%j%s%/@h$r30It%V%i%&%6$GI=<($9$k(B(2ESC M, 3ESC M, ..., 9ESC M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r8F$S$@$9(B)
      $B%U%!%$%k(B/$B%9%H%j!<%`A`:n(B
      @@ -257,8 +257,8 @@ w3m $B$N(Bmake$B;~$K;XDj$7$?%-!c$B8=:_$NJ8=q$N(B URL $B$rI=<($7$^$9!%(B =$B8=:_$NJ8=q$K4X$9$k>pJs$rI=<($7$^$9!%(B F<FRAMESET> $B$r4^$`J8=q$rI=<($7$F$$$k$H$-$K!$(B<FRAME> $B%?%0$N;X$9J#?t$NJ8=q$r(B1$B$D$NJ8=q$KJQ49$7$FI=<($7$^$9!%(B -M$B8=:_8+$F$$$k%Z!<%8$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2M, 3M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B -ESC M$B8=:_$N%j%s%/@h$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2ESC M, 3ESC M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B +M$B8=:_8+$F$$$k%Z!<%8$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2M, 3M, ..., 9M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B +ESC M$B8=:_$N%j%s%/@h$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2ESC M, 3ESC M, ..., 9ESC M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B
      $B%U%!%$%k$H(B URL $B4X78$NA`:n(B
      diff --git a/w3m-doc/sample/keymap.cgi b/w3m-doc/sample/keymap.cgi index f68f5fb..d92c60f 100755 --- a/w3m-doc/sample/keymap.cgi +++ b/w3m-doc/sample/keymap.cgi @@ -203,7 +203,6 @@ GOTO_LINK HELP HISTORY INFO -INIT_MAILCAP INTERRUPT LEFT LINE_BEGIN diff --git a/w3mbookmark.c b/w3mbookmark.c index 4355536..a306f26 100644 --- a/w3mbookmark.c +++ b/w3mbookmark.c @@ -79,6 +79,7 @@ print_bookmark_panel(char *bmark, char *url, char *title, char *charset) } } printf("\n"); + fclose(f); } printf(bkmark_src2, html_quote(url), html_quote(title)); } @@ -99,7 +100,7 @@ create_new_bookmark(char *bmark, char *section, char *title, char *url, fprintf(f, "\n

      Bookmarks

      \n"); fprintf(f, "

      %s

      \n
        \n", section); fprintf(f, "
      • %s\n", url, title); - fprintf(f, end_section); + fprintf(f, "%s", end_section); fprintf(f, "
      \n\n\n"); fclose(f); } @@ -168,7 +169,10 @@ insert_bookmark(char *bmark, struct parsed_tagarg *data) /* In this case, a new bookmark is appeneded after the bookmark file */ return create_new_bookmark(bmark, section, title, url, "a"); } - f = fopen(bmark, "w"); + if ((f = fopen(bmark, "w")) == NULL) { + printf("\nCannot open bookmark %s\n", bmark); + return FALSE; + } while (tl->nitem) { fputs(popText(tl), f); } diff --git a/w3mhelp-lynx_en.html.in b/w3mhelp-lynx_en.html.in index 7448877..d073b0f 100644 --- a/w3mhelp-lynx_en.html.in +++ b/w3mhelp-lynx_en.html.in @@ -43,20 +43,20 @@ w3m
      RET, C-f, Right arrowFollow hyperlink
      d, ESC RETSave link to file -
      uPeek link URL -
      iPeek image URL +
      uPeek at link URL +
      iPeek at image URL
      IView inline image
      ESC ISave inline image to file -
      :Mark URL-like strings as anchors -
      ESC :Mark Message-ID-like strings as news anchors -
      cPeek current URL +
      :Mark URL-like strings as links +
      ESC :Mark Message-ID-like strings as links +
      cPeek at current URL
      =Display information about current document -
      C-hView history of URL -
      FRender frame +
      C-hView browser history +
      FRender frames
      MBrowse current document using external browser -(use 2M and 3M to invoke second and third browser) +(prefix 2, 3, ..., or 9 to invoke alternate configured browsers, e.g. 3 M)
      ESC MBrowse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) +(prefixed as above, e.g. 3ESC M)

      File/Stream operation

      @@ -98,7 +98,7 @@ w3m
      /, C-sSearch forward
      nSearch next -
      wToggle wrap search mode +
      wToggle search wrap mode

      Mark operation

      @@ -121,7 +121,7 @@ w3m QQuit without confirmation -

      Line-edit mode

      +

      Line-editing mode

      C-fMove cursor forward
      C-bMove cursor backward diff --git a/w3mhelp-lynx_ja.html.in b/w3mhelp-lynx_ja.html.in index d160984..828b5a3 100644 --- a/w3mhelp-lynx_ja.html.in +++ b/w3mhelp-lynx_ja.html.in @@ -58,9 +58,9 @@
      F<FRAMESET>ޤʸɽƤȤˡ<FRAME> λؤʣʸ1ĤʸѴɽޤ
      M߸Ƥڡ򡤳֥饦Ȥäɽޤ -2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ +2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ
      ESC MߤΥ򡤳֥饦Ȥäɽޤ -2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ +2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ

      եURLط

      diff --git a/w3mhelp-w3m_en.html.in b/w3mhelp-w3m_en.html.in index eb46e8a..a692142 100644 --- a/w3mhelp-w3m_en.html.in +++ b/w3mhelp-w3m_en.html.in @@ -47,21 +47,21 @@ w3m
      RETFollow hyperlink
      a, ESC RETSave link to file -
      uPeek link URL -
      iPeek image URL +
      uPeek at link URL +
      iPeek at image URL
      IView inline image
      ESC ISave inline image to file -
      :Mark URL-like strings as anchors -
      ESC :Mark Message-ID-like strings as news anchors -
      cPeek current URL +
      :Mark URL-like strings as links +
      ESC :Mark Message-ID-like strings as links +
      cPeek at current URL
      =Display information about current document
      C-gShow current line number -
      C-hView history of URL -
      FRender frame +
      C-hView browser history +
      FRender frames
      MBrowse current document using external browser -(use 2M and 3M to invoke second and third browser) +(prefix 2, 3, ..., or 9 to invoke alternate configured browsers, e.g. 3 M)
      ESC MBrowse link using external browser -(use 2ESC M and 3ESC M to invoke second and third browser) +(prefixed as above, e.g. 3ESC M)

      File/Stream operation

      @@ -105,7 +105,7 @@ w3m ?,C-rSearch backward nSearch next NSearch previous -C-wToggle wrap search mode +C-wToggle search wrap mode

      Dictionary look-up

      @@ -134,7 +134,7 @@ w3m QQuit without confirmation -

      Line-edit mode

      +

      Line-editing mode

      - - + +
      C-fMove cursor forward
      C-bMove cursor backward diff --git a/w3mhelp-w3m_ja.html.in b/w3mhelp-w3m_ja.html.in index 95464ab..72cb849 100644 --- a/w3mhelp-w3m_ja.html.in +++ b/w3mhelp-w3m_ja.html.in @@ -61,8 +61,8 @@
      C-g ڡǤθ֤߰ɽ
      C-h URLɽ
      F ե졼ɽ
      M ڡ֥饦ɽ(2M,3M2ܤ3ܤΥ֥饦ƤӤ)
      ESC M ֥饦ɽ(2ESC M,3ESC M2ܤ3ܤΥ֥饦ƤӤ)
      M ڡ֥饦ɽ(2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦ƤӤ)
      ESC M ֥饦ɽ(2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦ƤӤ)

      ե/ȥ꡼

      diff --git a/w3mhelperpanel.c b/w3mhelperpanel.c index 110794b..96b60a0 100644 --- a/w3mhelperpanel.c +++ b/w3mhelperpanel.c @@ -115,6 +115,7 @@ printMailcapPanel(char *mailcap) printf("\n\n\n\ \n\n", MSG_DOIT); + fclose(f); } void diff --git a/w3mimg/Makefile.in b/w3mimg/Makefile.in index dfc550c..8e2ad73 100644 --- a/w3mimg/Makefile.in +++ b/w3mimg/Makefile.in @@ -16,9 +16,9 @@ IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@ IMGOBJS=@IMGOBJS@ .PHONY: $(SUBDIRS) -all: @IMGTARGETS@ w3mimg.a +all: w3mimg.a -w3mimg.a: $(IMGOBJS) +w3mimg.a: w3mimg.o @IMGTARGETS@ $(AR) rv $@ $(IMGOBJS) $(RANLIB) $@ diff --git a/w3mimg/fb/fb.c b/w3mimg/fb/fb.c index cd11128..7960584 100644 --- a/w3mimg/fb/fb.c +++ b/w3mimg/fb/fb.c @@ -12,12 +12,24 @@ #include #include #include +#if defined(__linux__) #include +#elif defined(__FreeBSD__) +#include +#endif +#if defined(__FreeBSD__) +#include +#include +#endif #include "fb.h" #define FB_ENV "FRAMEBUFFER" +#if defined(__linux__) #define FB_DEFDEV "/dev/fb0" +#elif defined(__FreeBSD__) +#define FB_DEFDEV "/dev/ttyv0" +#endif #define MONO_OFFSET_8BIT 0x40 #define COLORS_MONO_8BIT 0x40 @@ -38,22 +50,65 @@ #define IMAGE_SIZE_MAX 10000 +#if defined(__linux__) static struct fb_cmap *fb_cmap_create(struct fb_fix_screeninfo *, struct fb_var_screeninfo *); +#elif defined(__FreeBSD__) +static video_color_palette_t *fb_cmap_create(video_info_t *video_info, + video_adapter_info_t *video_adapter_info); +#endif +#if defined(__linux__) static void fb_cmap_destroy(struct fb_cmap *cmap); +#elif defined(__FreeBSD__) +static void fb_cmap_destroy(video_color_palette_t *cmap); +#endif +#if defined(__linux__) static int fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo); +#endif +#if defined(__linux__) static void *fb_mmap(int fbfp, struct fb_fix_screeninfo *scinfo); +#elif defined(__FreeBSD__) +static void *fb_mmap(int fbfp, video_adapter_info_t *video_adapter_info); +#endif +#if defined(__linux__) static int fb_munmap(void *buf, struct fb_fix_screeninfo *scinfo); +#elif defined(__FreeBSD__) +static int fb_munmap(void *buf, video_adapter_info_t *video_adapter_info); +#endif +#if defined(__linux__) static int fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo); +#endif +#if defined(__linux__) static int fb_cmap_set(int fbfp, struct fb_cmap *cmap); +#elif defined(__FreeBSD__) +static int fb_cmap_set(int fbfp, video_color_palette_t *cmap); +#endif +#if defined(__linux__) static int fb_cmap_get(int fbfp, struct fb_cmap *cmap); +#elif defined(__FreeBSD__) +static int fb_cmap_get(int fbfp, video_color_palette_t *cmap); +#endif static int fb_cmap_init(void); static int fb_get_cmap_index(int r, int g, int b); static unsigned long fb_get_packed_color(int r, int g, int b); +#if defined(__FreeBSD__) +static int fb_video_mode_get(int fbfp, int *video_mode); +static int fb_video_info_get(int fbfp, video_info_t *video_info); +static int fb_video_adapter_info_get(int fbfp, video_adapter_info_t *video_adapter_info); +#endif +#if defined(__linux__) static struct fb_fix_screeninfo fscinfo; static struct fb_var_screeninfo vscinfo; +#elif defined(__FreeBSD__) +static video_info_t video_info; +static video_adapter_info_t video_adapter_info; +#endif +#if defined(__linux__) static struct fb_cmap *cmap = NULL, *cmap_org = NULL; +#elif defined(__FreeBSD__) +static video_color_palette_t *cmap = NULL, *cmap_org = NULL; +#endif static int is_open = FALSE; static int fbfp = -1; static size_t pixel_size = 0; @@ -63,6 +118,9 @@ int fb_open(void) { char *fbdev = { FB_DEFDEV }; +#if defined(__FreeBSD__) + int video_mode; +#endif if (is_open == TRUE) return 1; @@ -76,6 +134,7 @@ fb_open(void) goto ERR_END; } +#if defined(__linux__) if (fb_fscrn_get(fbfp, &fscinfo)) { goto ERR_END; } @@ -83,22 +142,69 @@ fb_open(void) if (fb_vscrn_get(fbfp, &vscinfo)) { goto ERR_END; } +#elif defined(__FreeBSD__) + if (fb_video_mode_get(fbfp, &video_mode)) { + goto ERR_END; + } + video_info.vi_mode = video_mode; + + if (fb_video_info_get(fbfp, &video_info)) { + goto ERR_END; + } + if (fb_video_adapter_info_get(fbfp, &video_adapter_info)) { + goto ERR_END; + } + if (!(video_info.vi_flags & V_INFO_GRAPHICS) || + !(video_info.vi_flags & V_INFO_LINEAR)) { + goto ERR_END; + } +#endif + +#if defined(__linux__) if ((cmap = fb_cmap_create(&fscinfo, &vscinfo)) == (struct fb_cmap *)-1) { goto ERR_END; } +#elif defined(__FreeBSD__) + if ((cmap = fb_cmap_create(&video_info, &video_adapter_info)) == (video_color_palette_t *)-1) { + goto ERR_END; + } +#endif +#if defined(__linux__) if (!(buf = fb_mmap(fbfp, &fscinfo))) { fprintf(stderr, "Can't allocate memory.\n"); goto ERR_END; } +#elif defined(__FreeBSD__) + if (!(buf = fb_mmap(fbfp, &video_adapter_info))) { + fprintf(stderr, "Can't allocate memory.\n"); + goto ERR_END; + } +#endif +#if defined(__linux__) if (fscinfo.type != FB_TYPE_PACKED_PIXELS) { fprintf(stderr, "This type of framebuffer is not supported.\n"); goto ERR_END; } +#elif defined(__FreeBSD__) + if (!(video_info.vi_mem_model == V_INFO_MM_PACKED || + video_info.vi_mem_model == V_INFO_MM_DIRECT)) { + fprintf(stderr, "This type of framebuffer is not supported.\n"); + goto ERR_END; + } +#endif +#if defined(__linux__) if (fscinfo.visual == FB_VISUAL_PSEUDOCOLOR && vscinfo.bits_per_pixel == 8) { +#elif defined(__FreeBSD__) + if (video_adapter_info.va_flags & V_ADP_PALETTE && + video_info.vi_mem_model == V_INFO_MM_PACKED && + video_info.vi_depth == 8) { +#else + if (0) { +#endif if (fb_cmap_get(fbfp, cmap)) { fprintf(stderr, "Can't get color map.\n"); fb_cmap_destroy(cmap); @@ -111,6 +217,7 @@ fb_open(void) pixel_size = 1; } +#if defined(__linux__) else if ((fscinfo.visual == FB_VISUAL_TRUECOLOR || fscinfo.visual == FB_VISUAL_DIRECTCOLOR) && (vscinfo.bits_per_pixel == 15 || @@ -118,6 +225,14 @@ fb_open(void) vscinfo.bits_per_pixel == 24 || vscinfo.bits_per_pixel == 32)) { pixel_size = (vscinfo.bits_per_pixel + 7) / CHAR_BIT; } +#elif defined(__FreeBSD__) + else if (video_info.vi_mem_model == V_INFO_MM_DIRECT && + (video_info.vi_depth == 15 || + video_info.vi_depth == 16 || + video_info.vi_depth == 24 || video_info.vi_depth == 32)) { + pixel_size = (video_info.vi_depth + 7) / CHAR_BIT; + } +#endif else { fprintf(stderr, "This type of framebuffer is not supported.\n"); goto ERR_END; @@ -147,7 +262,11 @@ fb_close(void) cmap = NULL; } if (buf != NULL) { +#if defined(__linux__) fb_munmap(buf, &fscinfo); +#elif defined(__FreeBSD__) + fb_munmap(buf, &video_adapter_info); +#endif buf = NULL; } @@ -259,11 +378,19 @@ fb_image_draw(FB_IMAGE * image, int x, int y, int sx, int sy, int width, if (y + height > fb_height()) height = fb_height() - y; +#if defined(__linux__) offset_fb = fscinfo.line_length * y + pixel_size * x; +#elif defined(__FreeBSD__) + offset_fb = video_adapter_info.va_line_width * y + pixel_size * x; +#endif offset_img = image->rowstride * sy + pixel_size * sx; for (i = 0; i < height; i++) { memcpy(buf + offset_fb, image->data + offset_img, pixel_size * width); +#if defined(__linux__) offset_fb += fscinfo.line_length; +#elif defined(__FreeBSD__) + offset_fb += video_adapter_info.va_line_width; +#endif offset_img += image->rowstride; } @@ -336,7 +463,11 @@ fb_width(void) if (is_open != TRUE) return 0; +#if defined(__linux__) return vscinfo.xres; +#elif defined(__FreeBSD__) + return video_info.vi_width; +#endif } int @@ -345,7 +476,11 @@ fb_height(void) if (is_open != TRUE) return 0; +#if defined(__linux__) return vscinfo.yres; +#elif defined(__FreeBSD__) + return video_info.vi_height; +#endif } int @@ -369,7 +504,11 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) h = fb_height() - y; if (tmp == NULL) { +#if defined(__linux__) tmp = malloc(fscinfo.line_length); +#elif defined(__FreeBSD__) + tmp = malloc(video_adapter_info.va_line_width); +#endif if (tmp == NULL) return 1; } @@ -384,10 +523,18 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) gg = g; bb = b; } +#if defined(__linux__) offset_fb = fscinfo.line_length * y + pixel_size * x; +#elif defined(__FreeBSD__) + offset_fb = video_adapter_info.va_line_width * y + pixel_size * x; +#endif for (i = 0; i < h; i++) { memcpy(buf + offset_fb, tmp, pixel_size * w); +#if defined(__linux__) offset_fb += fscinfo.line_length; +#elif defined(__FreeBSD__) + offset_fb += video_adapter_info.va_line_width; +#endif } return 0; } @@ -400,11 +547,21 @@ fb_get_packed_color(int r, int g, int b) return fb_get_cmap_index(r, g, b); } else { +#if defined(__linux__) return ((r >> (CHAR_BIT - vscinfo.red.length)) << vscinfo.red.offset) + ((g >> (CHAR_BIT - vscinfo.green.length)) << vscinfo.green. offset) + ((b >> (CHAR_BIT - vscinfo.blue.length)) << vscinfo.blue.offset); +#elif defined(__FreeBSD__) + return + ((r >> (CHAR_BIT - video_info.vi_pixel_fsizes[0])) << + video_info.vi_pixel_fields[0]) + + ((g >> (CHAR_BIT - video_info.vi_pixel_fsizes[1])) << + video_info.vi_pixel_fields[1]) + + ((b >> (CHAR_BIT - video_info.vi_pixel_fsizes[2])) << + video_info.vi_pixel_fields[2]); +#endif } } @@ -433,16 +590,31 @@ fb_cmap_init(void) if (cmap == NULL) return 1; +#if defined(__linux__) if (cmap->len < COLOR_OFFSET_8BIT + COLORS_8BIT) { fprintf(stderr, "Can't allocate enough color.\n"); return 1; } +#elif defined(__FreeBSD__) + if (cmap->count < COLOR_OFFSET_8BIT + COLORS_8BIT) { + fprintf(stderr, "Can't allocate enough color.\n"); + return 1; + } +#endif if (cmap_org == NULL) { +#if defined(__linux__) if ((cmap_org = fb_cmap_create(&fscinfo, &vscinfo)) == (struct fb_cmap *)-1) { return 1; } +#elif defined(__FreeBSD__) + if ((cmap_org = + fb_cmap_create(&video_info, &video_adapter_info)) == + (video_color_palette_t *)-1) { + return 1; + } +#endif if (fb_cmap_get(fbfp, cmap_org)) { fprintf(stderr, "Can't get color map.\n"); @@ -452,8 +624,13 @@ fb_cmap_init(void) } } +#if defined(__linux__) cmap->start = MONO_OFFSET_8BIT; cmap->len = COLORS_8BIT + COLORS_MONO_8BIT; +#elif defined(__FreeBSD__) + cmap->index = MONO_OFFSET_8BIT; + cmap->count = COLORS_8BIT + COLORS_MONO_8BIT; +#endif for (lp = 0; lp < COLORS_MONO_8BIT; lp++) { int c; @@ -506,73 +683,223 @@ fb_cmap_init(void) #define LUT_MAX (256) +#if defined(__linux__) static struct fb_cmap * fb_cmap_create(struct fb_fix_screeninfo *fscinfo, struct fb_var_screeninfo *vscinfo) +#elif defined(__FreeBSD__) +static video_color_palette_t * +fb_cmap_create(video_info_t *video_info, + video_adapter_info_t *video_adapter_info) +#endif { +#if defined(__linux__) struct fb_cmap *cmap; +#elif defined(__FreeBSD__) + video_color_palette_t *cmap; +#endif int cmaplen = LUT_MAX; /* check the existence of colormap */ +#if defined(__linux__) if (fscinfo->visual == FB_VISUAL_MONO01 || fscinfo->visual == FB_VISUAL_MONO10 || fscinfo->visual == FB_VISUAL_TRUECOLOR) return NULL; +#elif defined(__FreeBSD__) + if (!(video_adapter_info->va_flags & V_ADP_PALETTE)) + return NULL; +#endif +#if defined(__linux__) cmap = (struct fb_cmap *)malloc(sizeof(struct fb_cmap)); +#elif defined(__FreeBSD__) + cmap = (video_color_palette_t *)malloc(sizeof(video_color_palette_t)); +#endif if (!cmap) { perror("cmap malloc error\n"); +#if defined(__linux__) return (struct fb_cmap *)-1; +#elif defined(__FreeBSD__) + return (video_color_palette_t *)-1; +#endif } +#if defined(__linux__) memset(cmap, 0, sizeof(struct fb_cmap)); +#elif defined(__FreeBSD__) + memset(cmap, 0, sizeof(video_color_palette_t)); +#endif + +#if defined(__FreeBSD__) + if (video_info->vi_mem_model == V_INFO_MM_PACKED) { + cmap->red = (u_char *) malloc(sizeof(u_char) * cmaplen); + if (!cmap->red) { + perror("red lut malloc error\n"); + return (video_color_palette_t *)-1; + } + cmap->green = (u_char *) malloc(sizeof(u_char) * cmaplen); + if (!cmap->green) { + perror("green lut malloc error\n"); + free(cmap->red); + return (video_color_palette_t *)-1; + } + cmap->blue = (u_char *) malloc(sizeof(u_char) * cmaplen); + if (!cmap->blue) { + perror("blue lut malloc error\n"); + free(cmap->red); + free(cmap->green); + return (video_color_palette_t *)-1; + } + cmap->transparent = (u_char *) malloc(sizeof(u_char) * cmaplen); + if (!cmap->transparent) { + perror("transparent lut malloc error\n"); + free(cmap->red); + free(cmap->green); + free(cmap->blue); + return (video_color_palette_t *)-1; + } + cmap->count = cmaplen; + return cmap; + } +#endif /* Allocates memory for a colormap */ +#if defined(__linux__) if (vscinfo->red.length) { cmap->red = (__u16 *) malloc(sizeof(__u16) * cmaplen); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[0]) { + cmap->red = (u_char *) malloc(sizeof(u_char) * cmaplen); +#else + if (0) { +#endif if (!cmap->red) { perror("red lut malloc error\n"); +#if defined(__linux__) return (struct fb_cmap *)-1; +#elif defined(__FreeBSD__) + return (video_color_palette_t *)-1; +#endif } } +#if defined(__linux__) if (vscinfo->green.length) { cmap->green = (__u16 *) malloc(sizeof(__u16) * cmaplen); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[1]) { + cmap->green = (u_char *) malloc(sizeof(u_char) * cmaplen); +#else + if (0) { +#endif if (!cmap->green) { +#if defined(__linux__) if (vscinfo->red.length) free(cmap->red); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[0]) + free(cmap->red); +#endif perror("green lut malloc error\n"); +#if defined(__linux__) return (struct fb_cmap *)-1; +#elif defined(__FreeBSD__) + return (video_color_palette_t *)-1; +#endif } } +#if defined(__linux__) if (vscinfo->blue.length) { cmap->blue = (__u16 *) malloc(sizeof(__u16) * cmaplen); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[2]) { + cmap->blue = (u_char *) malloc(sizeof(u_char) * cmaplen); +#else + if (0) { +#endif if (!cmap->blue) { +#if defined(__linux__) if (vscinfo->red.length) free(cmap->red); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[0]) + free(cmap->red); +#endif +#if defined(__linux__) if (vscinfo->green.length) free(cmap->green); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[1]) + free(cmap->green); +#endif perror("blue lut malloc error\n"); +#if defined(__linux__) return (struct fb_cmap *)-1; +#elif defined(__FreeBSD__) + return (video_color_palette_t *)-1; +#endif } } +#if defined(__linux__) if (vscinfo->transp.length) { cmap->transp = (__u16 *) malloc(sizeof(__u16) * cmaplen); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[3]) { + cmap->transparent = (u_char *) malloc(sizeof(u_char) * cmaplen); +#else + if (0) { +#endif +#if defined(__linux__) if (!cmap->transp) { +#elif defined(__FreeBSD__) + if (!cmap->transparent) { +#else + if (0) { +#endif +#if defined(__linux__) if (vscinfo->red.length) free(cmap->red); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[0]) + free(cmap->red); +#endif +#if defined(__linux__) if (vscinfo->green.length) free(cmap->green); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[1]) + free(cmap->green); +#endif +#if defined(__linux__) if (vscinfo->blue.length) free(cmap->blue); perror("transp lut malloc error\n"); +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[2]) + free(cmap->blue); + perror("transparent lut malloc error\n"); +#endif +#if defined(__linux__) return (struct fb_cmap *)-1; +#elif defined(__FreeBSD__) + return (video_color_palette_t *)-1; +#endif } } +#if defined(__linux__) cmap->len = cmaplen; +#elif defined(__FreeBSD__) + cmap->count = cmaplen; +#endif return cmap; } +#if defined(__linux__) static void fb_cmap_destroy(struct fb_cmap *cmap) +#elif defined(__FreeBSD__) +static void +fb_cmap_destroy(video_color_palette_t *cmap) +#endif { if (cmap->red) free(cmap->red); @@ -580,28 +907,57 @@ fb_cmap_destroy(struct fb_cmap *cmap) free(cmap->green); if (cmap->blue) free(cmap->blue); +#if defined(__linux__) if (cmap->transp) free(cmap->transp); +#elif defined(__FreeBSD__) + if (cmap->transparent) + free(cmap->transparent); +#endif free(cmap); } +#if defined(__linux__) static int fb_cmap_get(int fbfp, struct fb_cmap *cmap) +#elif defined(__FreeBSD__) +static int +fb_cmap_get(int fbfp, video_color_palette_t *cmap) +#endif { +#if defined(__linux__) if (ioctl(fbfp, FBIOGETCMAP, cmap)) { perror("ioctl FBIOGETCMAP error\n"); return -1; } +#elif defined(__FreeBSD__) + if (ioctl(fbfp, FBIO_GETPALETTE, cmap) == -1) { + perror("ioctl FBIO_GETPALETTE error\n"); + return -1; + } +#endif return 0; } +#if defined(__linux__) static int fb_cmap_set(int fbfp, struct fb_cmap *cmap) +#elif defined(__FreeBSD__) +static int +fb_cmap_set(int fbfp, video_color_palette_t *cmap) +#endif { +#if defined(__linux__) if (ioctl(fbfp, FBIOPUTCMAP, cmap)) { perror("ioctl FBIOPUTCMAP error\n"); return -1; } +#elif defined(__FreeBSD__) + if (ioctl(fbfp, FBIO_SETPALETTE, cmap) == -1) { + perror("ioctl FBIO_SETPALETTE error\n"); + return -1; + } +#endif return 0; } @@ -612,10 +968,16 @@ fb_cmap_set(int fbfp, struct fb_cmap *cmap) * fb_munmap() deletes the mappings */ +#if defined(__linux__) static void * fb_mmap(int fbfp, struct fb_fix_screeninfo *scinfo) +#elif defined(__FreeBSD__) +static void * +fb_mmap(int fbfp, video_adapter_info_t *video_adapter_info) +#endif { void *buf; +#if defined(__linux__) if ((buf = (unsigned char *) mmap(NULL, scinfo->smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fbfp, (off_t) 0)) @@ -623,13 +985,41 @@ fb_mmap(int fbfp, struct fb_fix_screeninfo *scinfo) perror("mmap error"); return NULL; } +#elif defined(__FreeBSD__) + size_t mmap_offset; + size_t mmap_length; + mmap_offset = (size_t)(video_adapter_info->va_window) & (PAGE_MASK); + mmap_length = (size_t)(video_adapter_info->va_window_size + + mmap_offset + PAGE_MASK) & (~PAGE_MASK); + if ((buf = (unsigned char *) + mmap(NULL, mmap_length, PROT_READ | PROT_WRITE, MAP_SHARED, fbfp, + (off_t) 0)) + == MAP_FAILED) { + perror("mmap error"); + return NULL; + } +#endif return buf; } +#if defined(__linux__) static int fb_munmap(void *buf, struct fb_fix_screeninfo *scinfo) +#elif defined(__FreeBSD__) +static int +fb_munmap(void *buf, video_adapter_info_t *video_adapter_info) +#endif { +#if defined(__linux__) return munmap(buf, scinfo->smem_len); +#elif defined(__FreeBSD__) + size_t mmap_offset; + size_t mmap_length; + mmap_offset = (size_t)(video_adapter_info->va_window) & (PAGE_MASK); + mmap_length = (size_t)(video_adapter_info->va_window_size + + mmap_offset + PAGE_MASK) & (~PAGE_MASK); + return munmap((void *)((u_long)buf & (~PAGE_MASK)), mmap_length); +#endif } /* @@ -637,6 +1027,7 @@ fb_munmap(void *buf, struct fb_fix_screeninfo *scinfo) * * fb_fscrn_get() get information */ +#if defined(__linux__) static int fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo) { @@ -646,12 +1037,14 @@ fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo) } return 0; } +#endif /* * (struct fb_var_screeninfo) device independent variable information * * fb_vscrn_get() get information */ +#if defined(__linux__) static int fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo) { @@ -661,3 +1054,41 @@ fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo) } return 0; } +#endif + +#if defined(__FreeBSD__) +static int +fb_video_mode_get(int fbfp, int *video_mode) +{ + if (ioctl(fbfp, FBIO_GETMODE, video_mode) == -1) { + perror("ioctl FBIO_GETMODE error\n"); + return -1; + } + return 0; +} +#endif + +#if defined(__FreeBSD__) +static int +fb_video_info_get(int fbfp, video_info_t *video_info) +{ + if (ioctl(fbfp, FBIO_MODEINFO, video_info) == -1) { + perror("ioctl FBIO_MODEINFO error\n"); + return -1; + } + return 0; +} +#endif + +#if defined(__FreeBSD__) +static int +fb_video_adapter_info_get(int fbfp, video_adapter_info_t *video_adapter_info) +{ + if (ioctl(fbfp, FBIO_ADPINFO, video_adapter_info) == -1) { + perror("ioctl FBIO_ADPINFO error\n"); + return -1; + } + return 0; +} +#endif + diff --git a/w3mimg/fb/fb.h b/w3mimg/fb/fb.h index 1138bb0..5d86454 100644 --- a/w3mimg/fb/fb.h +++ b/w3mimg/fb/fb.h @@ -1,7 +1,11 @@ /* $Id: fb.h,v 1.7 2003/07/07 15:48:17 ukai Exp $ */ #ifndef fb_header #define fb_header +#if defined(__linux__) #include +#elif defined(__FreeBSD__) +#include +#endif typedef struct { int num; diff --git a/w3mimg/fb/fb_gdkpixbuf.c b/w3mimg/fb/fb_gdkpixbuf.c index 36e3b62..f1e8d97 100644 --- a/w3mimg/fb/fb_gdkpixbuf.c +++ b/w3mimg/fb/fb_gdkpixbuf.c @@ -6,7 +6,7 @@ #include "config.h" #if defined(USE_GTK2) #include -#include +#include #endif #include #include "fb.h" diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c index ea36637..1a5151c 100644 --- a/w3mimg/fb/fb_imlib2.c +++ b/w3mimg/fb/fb_imlib2.c @@ -3,7 +3,6 @@ fb_imlib2.c 0.3 Copyright (C) 2002, hito **************************************************************************/ -#include #include #include "fb.h" #include "fb_img.h" diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c index d3ae5a9..62511f0 100644 --- a/w3mimg/fb/fb_w3mimg.c +++ b/w3mimg/fb/fb_w3mimg.c @@ -153,10 +153,15 @@ check_tty_console(char *tty) return 0; if (strncmp(tty, "/dev/", 5) == 0) tty += 5; +#if defined(__linux__) if (strncmp(tty, "tty", 3) == 0 && isdigit(*(tty + 3))) return 1; if (strncmp(tty, "vc/", 3) == 0 && isdigit(*(tty + 3))) return 1; +#elif defined(__FreeBSD__) + if (strncmp(tty, "ttyv", 4) == 0 && isxdigit(*(tty + 4))) + return 1; +#endif return 0; } #else @@ -172,7 +177,9 @@ w3mimg_fbopen() return NULL; memset(wop, 0, sizeof(w3mimg_op)); - if (!check_tty_console(getenv("W3M_TTY")) && strcmp("jfbterm", getenv("TERM")) != 0) { + if (!check_tty_console(getenv("W3M_TTY")) && + strncmp("fbterm", getenv("TERM"), 6) != 0 && + strncmp("jfbterm", getenv("TERM"), 7) != 0) { fprintf(stderr, "w3mimgdisplay/fb: tty is not console\n"); goto error; } diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c index f5be4a8..9a539de 100644 --- a/w3mimg/x11/x11_w3mimg.c +++ b/w3mimg/x11/x11_w3mimg.c @@ -14,7 +14,7 @@ #elif defined(USE_GDKPIXBUF) #if defined(USE_GTK2) #include -#include +#include #include #else #include @@ -121,24 +121,32 @@ x11_init(w3mimg_op * self) if (self == NULL) return 0; xi = (struct x11_info *)self->priv; +#if defined(USE_IMLIB) if (xi == NULL) return 0; -#if defined(USE_IMLIB) if (!xi->id) { xi->id = Imlib_init(xi->display); if (!xi->id) return 0; } #elif defined(USE_GDKPIXBUF) - if (!xi->init_flag) { + if (!xi) { +#if defined(USE_GTK2) + g_type_init(); +#endif + } + else if (!xi->init_flag) { + XWindowAttributes attr; #if defined(USE_GTK2) g_type_init(); #endif - gdk_pixbuf_xlib_init(xi->display, 0); + XGetWindowAttributes(xi->display, xi->parent, &attr); + /* gdk_pixbuf_xlib_init_with_depth() ignores depth, sigh... */ + gdk_pixbuf_xlib_init_with_depth(xi->display, 0, attr.depth); xi->init_flag = TRUE; } #endif - if (!xi->imageGC) { + if (xi && !xi->imageGC) { xi->imageGC = XCreateGC(xi->display, xi->parent, 0, NULL); if (!xi->imageGC) return 0; @@ -200,14 +208,16 @@ x11_set_background(w3mimg_op * self, char *background) { XColor screen_def, exact_def; struct x11_info *xi; + XWindowAttributes attr; if (self == NULL) return; xi = (struct x11_info *)self->priv; if (xi == NULL) return; + XGetWindowAttributes(xi->display, xi->window, &attr); if (background && - XAllocNamedColor(xi->display, DefaultColormap(xi->display, 0), + XAllocNamedColor(xi->display, attr.colormap, background, &screen_def, &exact_def)) xi->background_pixel = screen_def.pixel; else { @@ -216,7 +226,7 @@ x11_set_background(w3mimg_op * self, char *background) XImage *i; p = XCreatePixmap(xi->display, xi->window, 1, 1, - DefaultDepth(xi->display, 0)); + attr.depth); gc = XCreateGC(xi->display, xi->window, 0, NULL); if (!p || !gc) exit(1); /* XXX */ @@ -258,6 +268,7 @@ x11_img_new(struct x11_info *xi, int w, int h, int n) { struct x11_image *img = NULL; int i; + XWindowAttributes attr; img = malloc(sizeof(*img)); if (!img) @@ -267,9 +278,10 @@ x11_img_new(struct x11_info *xi, int w, int h, int n) if (!img->pixmap) goto ERROR; + XGetWindowAttributes(xi->display, xi->window, &attr); for (i = 0; i < n; i++) { img->pixmap[i] = XCreatePixmap(xi->display, xi->parent, w, h, - DefaultDepth(xi->display, 0)); + attr.depth); if (!img->pixmap[i]) goto ERROR; @@ -318,6 +330,41 @@ resize_image(GdkPixbuf * pixbuf, int width, int height) return NULL; return resized_pixbuf; } + +#if defined(USE_GTK2) +static void +render_pixbuf_to_pixmap_32(Display *display, GC gc, Pixmap pixmap, GdkPixbuf * pixbuf) +{ + unsigned int x, y, width, height, rowstride, bytes_per_pixel; + unsigned char *line; + XImage *image; + + width = gdk_pixbuf_get_width(pixbuf) ; + height = gdk_pixbuf_get_height(pixbuf) ; + + if (!(image = XGetImage(display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap))) + return ; + + bytes_per_pixel = (gdk_pixbuf_get_has_alpha(pixbuf)) ? 4 : 3; + rowstride = gdk_pixbuf_get_rowstride(pixbuf); + line = gdk_pixbuf_get_pixels(pixbuf); + + for (y = 0; y < height; y++) { + u_char *pixel; + + pixel = line; + for (x = 0; x < width; x++) { + XPutPixel(image, x, y, + (pixel[0] <<16) | (pixel[1] <<8) | pixel[2] | 0xff000000); + pixel += bytes_per_pixel; + } + line += rowstride; + } + + XPutImage(display, pixmap, gc, image, 0, 0, 0, 0, width, height); + XDestroyImage(image); +} +#endif #endif static int @@ -342,6 +389,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) GList *frames; #endif #endif + XWindowAttributes attr; if (self == NULL) return 0; @@ -349,6 +397,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) if (xi == NULL) return 0; + XGetWindowAttributes(xi->display, xi->window, &attr); #if defined(USE_IMLIB) im = Imlib_load_image(xi->id, fname); if (!im) @@ -358,7 +407,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) if (h <= 0) h = im->rgb_height; img->pixmap = (void *)XCreatePixmap(xi->display, xi->parent, w, h, - DefaultDepth(xi->display, 0)); + attr.depth); if (!img->pixmap) return 0; XSetForeground(xi->display, xi->imageGC, xi->background_pixel); @@ -374,17 +423,21 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) w = imlib_image_get_width(); if (h <= 0) h = imlib_image_get_height(); + + im = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), w, h); + imlib_context_set_image(im); + img->pixmap = (void *)XCreatePixmap(xi->display, xi->parent, w, h, - DefaultDepth(xi->display, 0)); + attr.depth); if (!img->pixmap) return 0; XSetForeground(xi->display, xi->imageGC, xi->background_pixel); XFillRectangle(xi->display, (Pixmap) img->pixmap, xi->imageGC, 0, 0, w, h); imlib_context_set_display(xi->display); - imlib_context_set_visual(DefaultVisual(xi->display, 0)); - imlib_context_set_colormap(DefaultColormap(xi->display, 0)); + imlib_context_set_visual(attr.visual); + imlib_context_set_colormap(attr.colormap); imlib_context_set_drawable((Drawable) img->pixmap); - imlib_render_image_on_drawable_at_size(0, 0, w, h); + imlib_render_image_on_drawable(0, 0); imlib_free_image(); #elif defined(USE_GDKPIXBUF) max_anim = self->max_anim; @@ -416,7 +469,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) ratio_h = 1.0 * h / ih; } tmp_pixmap = XCreatePixmap(xi->display, xi->parent, w, h, - DefaultDepth(xi->display, 0)); + attr.depth); XSetForeground(xi->display, xi->imageGC, xi->background_pixel); XFillRectangle(xi->display, (Pixmap) tmp_pixmap, xi->imageGC, 0, 0, w, h); if (!tmp_pixmap) { @@ -459,7 +512,10 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h) if (delay > ximg->delay) ximg->delay = delay; - gdk_pixbuf_xlib_render_to_drawable_alpha(pixbuf, + if (attr.depth == 32) + render_pixbuf_to_pixmap_32(xi->display, xi->imageGC, ximg->pixmap[j], pixbuf); + else + gdk_pixbuf_xlib_render_to_drawable_alpha(pixbuf, (Drawable) ximg->pixmap[j], 0, 0, 0, 0, w, h, GDK_PIXBUF_ALPHA_BILEVEL, 1, @@ -653,9 +709,11 @@ x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w, if (self == NULL) return 0; +#if defined(USE_IMLIB) && defined(USE_IMLIB2) xi = (struct x11_info *)self->priv; if (xi == NULL) return 0; +#endif #if defined(USE_IMLIB) im = Imlib_load_image(xi->id, fname); @@ -755,6 +813,9 @@ w3mimg_x11open() return NULL; memset(wop, 0, sizeof(w3mimg_op)); + if (getenv("W3M_USE_REMOTE_IMAGE")) + goto end; + xi = (struct x11_info *)malloc(sizeof(struct x11_info)); if (xi == NULL) goto error; @@ -807,6 +868,7 @@ w3mimg_x11open() wop->priv = xi; + end: wop->init = x11_init; wop->finish = x11_finish; wop->active = x11_active; diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c index 5486a47..ccfa373 100644 --- a/w3mimgdisplay.c +++ b/w3mimgdisplay.c @@ -281,6 +281,10 @@ DrawImage(char *buf, int redraw) maxImage = n + 1; imageBuf = (W3MImage *) realloc((void *)imageBuf, sizeof(W3MImage) * maxImage); + if (imageBuf == NULL) { + fprintf(stderr, "Out of memory\n"); + exit(1); + } for (; i < maxImage; i++) imageBuf[i].pixmap = NULL; }