<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ce0bb489ca37d9569db2a4105f42c39580e50f6">https://github.com/macports/macports-ports/commit/9ce0bb489ca37d9569db2a4105f42c39580e50f6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9ce0bb4 w3m: update to 0.5.3-37
</span>9ce0bb4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9ce0bb489ca37d9569db2a4105f42c39580e50f6
</span>Author: David Gilman <davidgilman1@gmail.com>
AuthorDate: Fri May 3 16:28:41 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> w3m: update to 0.5.3-37
</span>---
www/w3m/Portfile | 4 +-
www/w3m/files/debian/020_debian.patch | 2011 +++++++++++++++++++++++----------
2 files changed, 1444 insertions(+), 571 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/Portfile b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2964cb..817cc93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name w3m
version 0.5.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> categories www
license MIT
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +81,6 @@ variant inline_image_imlib2 description {View inline images with imlib2} {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version "${version}-36"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version "${version}-37"
</span> livecheck.url https://packages.debian.org/unstable/w3m
livecheck.regex ${name}_(\\d+(?:\\.\\d+)*-\\d+)(?:\\.\\d+)?.debian.tar.xz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/files/debian/020_debian.patch b/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ebaf8f0..bcb8c2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/files/debian/020_debian.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,10 +60,84 @@ index 8f443c1..5fb6581 100755
</span> $input = "w3m-control: GOTO_LINK";
}
diff --git a/ChangeLog b/ChangeLog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 88358ef..b14c60a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 88358ef..7367d67 100644
</span> --- a/ChangeLog
+++ ChangeLog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,1618 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,1693 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-01-05 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * NEWS: Update NEWS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * config.guess, config.sub:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Update config.* with autotools-dev 20180224.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2019-01-05 Akinori Hattori <hattya@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * w3mimg/fb/fb_imlib2.c: Fix dependency for Imlib2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Gentoo: https://bugs.gentoo.org/605930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d6e3e6839898829e8cce211b97a7fa77f5d06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-12-22 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * scripts/w3mman/w3mman.1.in, scripts/w3mman/w3mman.in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Fix square brackets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-12-21 Nemo Inis <nemoinis@hotmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * scripts/w3mman/w3mman.1.in, scripts/w3mman/w3mman.in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * scripts/w3mman/w3mman2html.cgi.in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ w3mman support for section number during keyword search.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916968#5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-10-26 Ben Wong <bugs.debian.org@wongs.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * buffer.c, display.c:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Fix that the MarkAllPages option works as originally intended.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911929
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-10-26 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * istream.c, url.c: Indentation fix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-10-24 Mark Wright <gienah@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * istream.c, url.c: Do not use deprecated features with openssl-1.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Gentoo: https://bugs.gentoo.org/592510
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Debian: https://github.com/tats/w3m/pull/103
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-05-20 Andrew Santosa <santosa_1999@yahoo.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * po/Makefile.in.in: Added check for : command not producing .gmo file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Debian: https://github.com/tats/w3m/pull/99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-03-24 Tatsuya Kinoshita <tats@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * table.c: Respect simple_preserve_space for table cells.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893902
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-03-23 Mike <barbeque@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Update grammar & spelling in some English READMEs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.img: Update README.img.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.dict: Update README.dict.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.pre_form: Update README.pre_form.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.cookie: Update README.cookie.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * doc/README.cookie: Update README.cookie.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++2018-03-04 Jia Zhouyang <jiazhouyang@nudt.edu.cn>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Fix crashes when some external APIs fail.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Origin: https://github.com/tats/w3m/pull/96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * url.c: Add error handling code for fopen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Check the return code of fopen, and return when it fails.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * file.c: Add error handling code for fopen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Check the return value of fopen, and add proper error handling code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * local.c: Add error handling for chdir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ When chdir fails, print error message and exit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +2018-01-25 Tatsuya Kinoshita <tats@debian.org>
+
+ * ChangeLog, NEWS: Add CVE IDs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +182,7 @@ index 88358ef..b14c60a 100644
</span> +
+ * w3mimg/fb/fb_w3mimg.c: Accept TERM=fbterm.
+ cf. https://bushowhige.blogspot.jp/2015/01/fbterm-w3m-img.html
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=590668
</span> +
+2017-12-27 Tatsuya Kinoshita <tats@debian.org>
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1734,10 +1809,21 @@ index 7d692f9..453072d 100644
</span> do \
(cd $$dir && $(MAKE) $(MAKE_ARGS) uninstall); \
diff --git a/NEWS b/NEWS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 66e309d..4ed621a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 66e309d..dac1f5c 100644
</span> --- a/NEWS
+++ NEWS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,89 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Debian's w3m 0.5.3+git20190105
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* bug fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - do not use deprecated features with OpenSSL 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - fix dependency for Imlib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - fix that the mark_all_pages option works
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - respect the simple_preserve_space option for table cells
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - fix error handling for ~/.w3m/request.log and localcgi_post()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* new feature
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - w3mman supports specifying a section number during a keyword search
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +Debian's w3m 0.5.3+git20180125
+
+* bug fixes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2300,10 +2386,19 @@ index 27bbd56..b6d121c 100644
</span> "</a><br>", p, "\n", NULL);
}
diff --git a/buffer.c b/buffer.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5afc26a..3b2352a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5afc26a..e70cffe 100644
</span> --- a/buffer.c
+++ buffer.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -705,6 +705,7 @@ readBufferCache(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,8 @@ newBuffer(int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_M17N
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n->auto_detect = WcOption.auto_detect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ n->check_url = MarkAllPages; /* use default from -o mark_all_pages */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ n->need_reshape = 1; /* always reshape new buffers to mark URLs */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return n;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -705,6 +707,7 @@ readBufferCache(Buffer *buf)
</span>
cache = fopen(buf->savecache, "r");
if (cache == NULL || fread1(clnum, cache) || fread1(tlnum, cache)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2311,7 +2406,7 @@ index 5afc26a..3b2352a 100644
</span> buf->savecache = NULL;
return -1;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -760,8 +761,10 @@ readBufferCache(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -760,8 +763,10 @@ readBufferCache(Buffer *buf)
</span> }
#endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2325,7 +2420,7 @@ index 5afc26a..3b2352a 100644
</span> unlink(buf->savecache);
buf->savecache = NULL;
diff --git a/config.guess b/config.guess
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 51fab47..31e01ef 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 51fab47..f50dcdb 100755
</span> --- a/config.guess
+++ config.guess
@@ -1,13 +1,12 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2333,10 +2428,10 @@ index 51fab47..31e01ef 100755
</span> # 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright 1992-2017 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright 1992-2018 Free Software Foundation, Inc.
</span>
-timestamp='2004-03-12'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+timestamp='2017-11-07'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++timestamp='2018-02-24'
</span>
# 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2395,7 +2490,7 @@ index 51fab47..31e01ef 100755
</span> Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright 1992-2017 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Copyright 1992-2018 Free Software Foundation, Inc.
</span>
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2414,7 +2509,7 @@ index 51fab47..31e01ef 100755
</span> -- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +100,7 @@ set_cc_for_build='
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,16 +100,16 @@ set_cc_for_build='
</span> 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} ;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2423,6 +2518,17 @@ index 51fab47..31e01ef 100755
</span> { 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 ; } ;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dummy=$tmp/dummy ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $CC_FOR_BUILD,$HOST_CC,$CC in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ,,) echo "int x;" > $dummy.c ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ,,) echo "int x;" > "$dummy.c" ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for c in cc gcc c89 c99 ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC_FOR_BUILD="$c"; break ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done ;
</span> @@ -123,7 +119,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
;;
,,*) CC_FOR_BUILD=$CC ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2432,18 +2538,18 @@ index 51fab47..31e01ef 100755
</span>
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,12 +132,40 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
</span> UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+case "${UNAME_SYSTEM}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "$UNAME_SYSTEM" in
</span> +Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cat <<-EOF > $dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat <<-EOF > "$dummy.c"
</span> + #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2453,13 +2559,21 @@ index 51fab47..31e01ef 100755
</span> + LIBC=gnu
+ #endif
+ EOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # If ldd exists, use it to detect musl libc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if command -v ldd >/dev/null && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ldd --version 2>&1 | grep -q ^musl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBC=musl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span> + ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
</span> *:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2467,45 +2581,49 @@ index 51fab47..31e01ef 100755
</span> # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,22 +168,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,22 +175,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> # 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)`
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "${UNAME_MACHINE_ARCH}" in
</span> + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /sbin/$sysctl 2>/dev/null || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /usr/sbin/$sysctl 2>/dev/null || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/sbin/$sysctl" 2>/dev/null || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "/usr/sbin/$sysctl" 2>/dev/null || \
</span> + echo unknown)`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${UNAME_MACHINE_ARCH}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE_ARCH" in
</span> armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
</span> + sh5el) machine=sh5le-unknown ;;
+ earmv*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ machine=${arch}${endian}-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ machine="${arch}${endian}"-unknown
</span> + ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
</span> esac
# The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "${UNAME_MACHINE_ARCH}" in
</span> + # to ELF recently (or will in the future) and ABI.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${UNAME_MACHINE_ARCH}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE_ARCH" in
</span> + earm*)
+ os=netbsdelf
+ ;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span> 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?
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +204,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,7 +211,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> fi
;;
*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2514,19 +2632,25 @@ index 51fab47..31e01ef 100755
</span> + ;;
+ esac
+ # Determine ABI tags.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "${UNAME_MACHINE_ARCH}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE_ARCH" in
</span> + earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
</span> ;;
esac
# The OS release
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,78 +224,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,83 +226,62 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # thus, need a distinct triplet. However, they do not need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # kernel version information, so it can be replaced with a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # suitable tag, in the style of linux-gnu.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_VERSION" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Debian*)
</span> release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
</span> ;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2579,47 +2703,52 @@ index 51fab47..31e01ef 100755
</span> - wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "${machine}-${os}${release}${abi}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$machine-${os}${release}${abi}"
</span> + exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
</span> + exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
</span> + exit ;;
+ *:LibertyBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
</span> + exit ;;
+ *:MidnightBSD:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
</span> + exit ;;
*:ekkoBSD:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
</span> + exit ;;
+ *:SolidBSD:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
</span> + exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
</span> + exit ;;
*:MirBSD:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
</span> + exit ;;
+ *:Sortix:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-sortix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-sortix
</span> + exit ;;
+ *:Redox:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-redox
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-redox
</span> + exit ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ mips:OSF1:*.*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-dec-osf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit ;;
</span> alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2631,7 +2760,7 @@ index 51fab47..31e01ef 100755
</span> ;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,76 +281,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,76 +291,73 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> 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)")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2699,7 +2828,7 @@ index 51fab47..31e01ef 100755
</span> - 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
</span> + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+ exitcode=$?
+ trap '' 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2709,12 +2838,14 @@ index 51fab47..31e01ef 100755
</span> - exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-amigaos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-amigaos
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-amigaos
</span> + exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-morphos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-morphos
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-morphos
</span> + exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2729,8 +2860,9 @@ index 51fab47..31e01ef 100755
</span> + echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo arm-acorn-riscix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo arm-acorn-riscix${UNAME_RELEASE}
</span> - exit 0;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo arm-acorn-riscix"$UNAME_RELEASE"
</span> + exit ;;
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
+ echo arm-unknown-riscos
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2742,7 +2874,7 @@ index 51fab47..31e01ef 100755
</span> 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,32 +355,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,32 +365,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> else
echo pyramid-pyramid-bsd
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2763,24 +2895,26 @@ index 51fab47..31e01ef 100755
</span> + sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
</span> + exit ;;
sun4H:SunOS:5.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
</span> + exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span> - exit 0 ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
</span> + exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo i386-pc-auroraux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i386-pc-auroraux"$UNAME_RELEASE"
</span> + exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span> + 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.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2793,108 +2927,127 @@ index 51fab47..31e01ef 100755
</span> + SUN_ARCH=x86_64
+ fi
+ fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
</span> + 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
</span> + exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -381,13 +408,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,26 +417,26 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> esac
# Japanese Language versions have a version number like `4.1.3-JL'.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
</span> + exit ;;
sun3*:SunOS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-sun-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-sun-sunos${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-sun-sunos"$UNAME_RELEASE"
</span> + 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
</span> case "`/bin/arch`" in
sun3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-sun-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,10 +423,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-sun-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-sun-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-sun-sunos"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sun4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-sun-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-sun-sunos"$UNAME_RELEASE"
</span> ;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-auspex-sunos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-auspex-sunos${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-auspex-sunos"$UNAME_RELEASE"
</span> + 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -409,41 +436,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> # 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 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo m68k-atari-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-atari-mint"$UNAME_RELEASE"
</span> + exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-atari-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-atari-mint${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-atari-mint"$UNAME_RELEASE"
</span> + exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo m68k-atari-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-atari-mint"$UNAME_RELEASE"
</span> + exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo m68k-milan-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-milan-mint"$UNAME_RELEASE"
</span> + exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo m68k-hades-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-hades-mint"$UNAME_RELEASE"
</span> + exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo m68k-unknown-mint${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-unknown-mint"$UNAME_RELEASE"
</span> + exit ;;
m68k:machten:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-apple-machten${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-apple-machten${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-apple-machten"$UNAME_RELEASE"
</span> + exit ;;
powerpc:machten:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo powerpc-apple-machten${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo powerpc-apple-machten${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc-apple-machten"$UNAME_RELEASE"
</span> + exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo mips-dec-ultrix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo mips-dec-ultrix${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-dec-ultrix"$UNAME_RELEASE"
</span> + exit ;;
VAX*:ULTRIX*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo vax-dec-ultrix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo vax-dec-ultrix${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo vax-dec-ultrix"$UNAME_RELEASE"
</span> + exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo clipper-intergraph-clix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo clipper-intergraph-clix${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo clipper-intergraph-clix"$UNAME_RELEASE"
</span> + exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -455,47 +482,48 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed 's/^ //' << EOF > "$dummy.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h> /* for printf() prototype */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main (int argc, char *argv[]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -455,94 +492,95 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
</span> #endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2916,12 +3069,13 @@ index 51fab47..31e01ef 100755
</span> - $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $CC_FOR_BUILD -o $dummy $dummy.c &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SYSTEM_NAME=`$dummy $dummyarg` &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { echo "$SYSTEM_NAME"; exit; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo mips-mips-riscos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo mips-mips-riscos${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { echo "$SYSTEM_NAME"; exit; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-mips-riscos"$UNAME_RELEASE"
</span> + exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2954,14 +3108,25 @@ index 51fab47..31e01ef 100755
</span> AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
</span> + # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
</span> then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -508,29 +536,29 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ ${TARGET_BINARY_INTERFACE}x = x ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ "$TARGET_BINARY_INTERFACE"x = x ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m88k-dg-dgux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m88k-dg-dgux"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m88k-dg-dguxbcs${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m88k-dg-dguxbcs"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo i586-dg-dgux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo i586-dg-dgux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i586-dg-dgux"$UNAME_RELEASE"
</span> fi
- exit 0 ;;
+ exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2983,8 +3148,9 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
</span> + 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2998,22 +3164,30 @@ index 51fab47..31e01ef 100755
</span> ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -538,7 +566,7 @@ EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
</span> + exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -553,125 +581,140 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed 's/^ //' << EOF > "$dummy.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/systemcfg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -553,128 +591,143 @@ EOF
</span> exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
</span> + then
+ echo "$SYSTEM_NAME"
+ else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3029,7 +3203,8 @@ index 51fab47..31e01ef 100755
</span> + exit ;;
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
</span> IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3040,10 +3215,12 @@ index 51fab47..31e01ef 100755
</span> + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
</span> + exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3055,8 +3232,9 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
</span> - exit 0 ;; # report: romp-ibm BSD 4.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
</span> + exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3075,10 +3253,12 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "${UNAME_MACHINE}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "${UNAME_MACHINE}" in
</span> - 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE" in
</span> + 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3096,21 +3276,23 @@ index 51fab47..31e01ef 100755
</span> - esac ;;
- esac
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "${sc_cpu_version}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$sc_cpu_version" in
</span> + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "${sc_kernel_bits}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$sc_kernel_bits" in
</span> + 32) HP_ARCH=hppa2.0n ;;
+ 64) HP_ARCH=hppa2.0w ;;
+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
+ esac ;;
+ esac
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "${HP_ARCH}" = "" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ "${HP_ARCH}" = "" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span> - sed 's/^ //' << EOF >$dummy.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$HP_ARCH" = "" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed 's/^ //' << EOF > "$dummy.c"
</span>
- #define _HPUX_SOURCE
- #include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3172,17 +3354,17 @@ index 51fab47..31e01ef 100755
</span> + }
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
</span> test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ ${HP_ARCH} = hppa2.0w ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$HP_ARCH" = hppa2.0w ]
</span> 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span> +
+ # 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
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3203,23 +3385,31 @@ index 51fab47..31e01ef 100755
</span> + HP_ARCH=hppa64
fi
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
</span> + exit ;;
ia64:HP-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ia64-hp-hpux${HPUX_REV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ia64-hp-hpux${HPUX_REV}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo ia64-hp-hpux"$HPUX_REV"
</span> + exit ;;
3050*:HI-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -699,356 +742,356 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed 's/^ //' << EOF > "$dummy.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -699,360 +752,364 @@ EOF
</span> exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
</span> + { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3248,9 +3438,11 @@ index 51fab47..31e01ef 100755
</span> + exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-osf1mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-osf1mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-osf1mk
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-osf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-osf1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-osf1
</span> fi
- exit 0 ;;
+ exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3282,32 +3474,37 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
</span> + exit ;;
CRAY*[A-Z]90:*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
</span> | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
</span> + exit ;;
CRAY*T3E:*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
</span> + exit ;;
CRAY*SV1:*:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
</span> + exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
</span> + exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3317,7 +3514,7 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
</span> + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
5000:UNIX_System_V:4.*:*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3326,20 +3523,23 @@ index 51fab47..31e01ef 100755
</span> - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
</span> + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
</span> + exit ;;
sparc*:BSD/OS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-unknown-bsdi${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-unknown-bsdi${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-unknown-bsdi"$UNAME_RELEASE"
</span> + exit ;;
*:BSD/OS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
</span> + exit ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3359,31 +3559,33 @@ index 51fab47..31e01ef 100755
</span> - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${UNAME_PROCESSOR} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_PROCESSOR" in
</span> + amd64)
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
+ esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
</span> + exit ;;
i*:CYGWIN*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-cygwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-cygwin
</span> - exit 0 ;;
- i*:MINGW*:*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-mingw32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-cygwin
</span> + exit ;;
+ *:MINGW64*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-mingw64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-mingw64
</span> + exit ;;
+ *:MINGW*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-mingw32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-mingw32
</span> + exit ;;
+ *:MSYS*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-msys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-msys
</span> + exit ;;
i*:PW*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-pw32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-pw32
</span> - exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3397,55 +3599,59 @@ index 51fab47..31e01ef 100755
</span> - # UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
- exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-pw32
</span> + exit ;;
+ *:Interix*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case ${UNAME_MACHINE} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE" in
</span> + x86)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo i586-pc-interix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i586-pc-interix"$UNAME_RELEASE"
</span> + exit ;;
+ authenticamd | genuineintel | EM64T)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo x86_64-unknown-interix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo x86_64-unknown-interix"$UNAME_RELEASE"
</span> + exit ;;
+ IA64)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ia64-unknown-interix${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo ia64-unknown-interix"$UNAME_RELEASE"
</span> + exit ;;
+ esac ;;
i*:UWIN*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-uwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-uwin
</span> - exit 0 ;;
- p*:CYGWIN*:*)
- echo powerpcle-unknown-cygwin
- exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-uwin
</span> + exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
prep*:SunOS:5.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
</span> + exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
</span> + 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 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
</span> + exit ;;
i*86:Minix:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-minix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-minix
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-minix
</span> + exit ;;
+ aarch64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3459,74 +3665,76 @@ index 51fab47..31e01ef 100755
</span> + esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span> + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + else
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_PCS_VFP
+ then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
</span> + else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
</span> + fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
</span> + exit ;;
+ crisv32:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
</span> + exit ;;
+ e2k:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ frv:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ hexagon:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ i*86:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
</span> + exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ k1om:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- mips:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^ //' << EOF >$dummy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed 's/^ //' << EOF > "$dummy.c"
</span> #undef CPU
- #undef mips
- #undef mipsel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3546,8 +3754,8 @@ index 51fab47..31e01ef 100755
</span> EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
</span> ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3589,19 +3797,19 @@ index 51fab47..31e01ef 100755
</span> - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ mips64el:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ openrisc*:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo or1k-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo or1k-unknown-linux-"$LIBC"
</span> + exit ;;
+ or32:Linux:*:* | or1k*:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ padre:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo sparc-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-unknown-linux-"$LIBC"
</span> + exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo hppa64-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo hppa64-unknown-linux-"$LIBC"
</span> + exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3609,9 +3817,9 @@ index 51fab47..31e01ef 100755
</span> - PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *) echo hppa-unknown-linux-${LIBC} ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *) echo hppa-unknown-linux-"$LIBC" ;;
</span> esac
- exit 0 ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3619,45 +3827,45 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
+ ppc64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo powerpc64-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc64-unknown-linux-"$LIBC"
</span> + exit ;;
+ ppc:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo powerpc-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc-unknown-linux-"$LIBC"
</span> + exit ;;
+ ppc64le:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo powerpc64le-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc64le-unknown-linux-"$LIBC"
</span> + exit ;;
+ ppcle:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo powerpcle-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpcle-unknown-linux-"$LIBC"
</span> + exit ;;
+ riscv32:Linux:*:* | riscv64:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
</span> + exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ tile*:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
+ vax:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
</span> + exit ;;
x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3718,10 +3926,14 @@ index 51fab47..31e01ef 100755
</span> - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if objdump -f /bin/sh | grep -q elf32-x86-64; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span> + exit ;;
+ xtensa*:Linux:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
</span> + exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3739,45 +3951,55 @@ index 51fab47..31e01ef 100755
</span> + # 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Use sysv4.2uw... so that sysv4* matches it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Use sysv4.2uw... so that sysv4* matches it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
</span> + exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-os2-emx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-os2-emx
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-os2-emx
</span> + exit ;;
i*86:XTS-300:*:STOP)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-stop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-stop
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-stop
</span> + exit ;;
i*86:atheos:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-atheos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-atheos
</span> - exit 0 ;;
- i*86:syllable:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i*86:syllable:*:*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-syllable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-syllable
</span> - exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo i386-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-atheos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ i*86:syllable:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-syllable
</span> + exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo i386-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i386-unknown-lynxos"$UNAME_RELEASE"
</span> + exit ;;
i*86:*DOS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-msdosdjgpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-msdosdjgpp
</span> - exit 0 ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-msdosdjgpp
</span> + exit ;;
+ i*86:*:4.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
</span> if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
</span> fi
- exit 0 ;;
- i*86:*:5:[78]*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3789,15 +4011,27 @@ index 51fab47..31e01ef 100755
</span> *Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
</span> + exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1066,73 +1109,86 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1062,369 +1119,333 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && UNAME_MACHINE=i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && UNAME_MACHINE=i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-pc-sysv32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-pc-sysv32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-sysv32
</span> fi
- exit 0 ;;
+ exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3824,9 +4058,11 @@ index 51fab47..31e01ef 100755
</span> + exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
</span> else # Add other i860-SVR4 vendors below as they are discovered.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
</span> fi
- exit 0 ;;
+ exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3854,10 +4090,10 @@ index 51fab47..31e01ef 100755
</span> && 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
</span> /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
</span> 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3868,35 +4104,40 @@ index 51fab47..31e01ef 100755
</span> + 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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
</span> + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
</span> + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
</span> m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-unknown-lynxos${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-unknown-lynxos"$UNAME_RELEASE"
</span> + exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sparc-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sparc-unknown-lynxos${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sparc-unknown-lynxos"$UNAME_RELEASE"
</span> + exit ;;
rs6000:LynxOS:2.*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo rs6000-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo rs6000-unknown-lynxos${UNAME_RELEASE}
</span> - exit 0 ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo powerpc-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo rs6000-unknown-lynxos"$UNAME_RELEASE"
</span> + exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo powerpc-unknown-lynxos${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc-unknown-lynxos"$UNAME_RELEASE"
</span> + exit ;;
SM[BE]S:UNIX_SV:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo mips-dde-sysv${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo mips-dde-sysv${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-dde-sysv"$UNAME_RELEASE"
</span> + exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3909,7 +4150,8 @@ index 51fab47..31e01ef 100755
</span> *:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1140,291 +1196,239 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-sni-sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-sni-sysv4
</span> else
echo ns32k-sni-sysv
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3936,7 +4178,7 @@ index 51fab47..31e01ef 100755
</span> + exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green@stratus.com.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-stratus-vos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-stratus-vos
</span> + exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3944,8 +4186,9 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo m68k-apple-aux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo m68k-apple-aux${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo m68k-apple-aux"$UNAME_RELEASE"
</span> + exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3954,10 +4197,10 @@ index 51fab47..31e01ef 100755
</span> R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo mips-nec-sysv${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-nec-sysv"$UNAME_RELEASE"
</span> else
- echo mips-unknown-sysv${UNAME_RELEASE}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo mips-unknown-sysv${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-unknown-sysv"$UNAME_RELEASE"
</span> fi
- exit 0 ;;
+ exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3980,48 +4223,55 @@ index 51fab47..31e01ef 100755
</span> + echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sx4-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sx4-nec-superux${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx4-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
SX-5:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sx5-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sx5-nec-superux${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx5-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
SX-6:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo sx6-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo sx6-nec-superux${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx6-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
+ SX-7:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo sx7-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx7-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
+ SX-8:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo sx8-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx8-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
+ SX-8R:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo sx8r-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sx8r-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
+ SX-ACE:SUPER-UX:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo sxace-nec-superux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo sxace-nec-superux"$UNAME_RELEASE"
</span> + exit ;;
Power*:Rhapsody:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo powerpc-apple-rhapsody${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo powerpc-apple-rhapsody${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo powerpc-apple-rhapsody"$UNAME_RELEASE"
</span> + exit ;;
*:Rhapsody:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
</span> + exit ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
- esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 0 ;;
</span> + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval $set_cc_for_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$set_cc_for_build"
</span> + if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
</span> + 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) | \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4049,8 +4299,7 @@ index 51fab47..31e01ef 100755
</span> + # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
+ fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
</span> + exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4059,26 +4308,31 @@ index 51fab47..31e01ef 100755
</span> UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
</span> + exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-?:NONSTOP_KERNEL:*:*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo nsr-tandem-nsk${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 0 ;;
</span> + exit ;;
+ NEO-*:NONSTOP_KERNEL:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo neo-tandem-nsk${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo neo-tandem-nsk"$UNAME_RELEASE"
</span> + exit ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo nse-tandem-nsk${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo nse-tandem-nsk"$UNAME_RELEASE"
</span> + exit ;;
+ NSR-*:NONSTOP_KERNEL:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo nsr-tandem-nsk${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 0 ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo nsr-tandem-nsk"$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSV-*:NONSTOP_KERNEL:*:*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo nsv-tandem-nsk"$UNAME_RELEASE"
</span> + exit ;;
+ NSX-*:NONSTOP_KERNEL:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo nsx-tandem-nsk${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo nsx-tandem-nsk"$UNAME_RELEASE"
</span> + exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4089,8 +4343,9 @@ index 51fab47..31e01ef 100755
</span> - exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
</span> + exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4102,8 +4357,9 @@ index 51fab47..31e01ef 100755
</span> else
UNAME_MACHINE="$cputype"
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-plan9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-plan9
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-plan9
</span> + exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4132,15 +4388,16 @@ index 51fab47..31e01ef 100755
</span> SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo mips-sei-seiux${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo mips-sei-seiux"$UNAME_RELEASE"
</span> + exit ;;
*:DragonFly:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
</span> - exit 0 ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
</span> + exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case "${UNAME_MACHINE}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case "$UNAME_MACHINE" in
</span> + A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4149,16 +4406,16 @@ index 51fab47..31e01ef 100755
</span> + echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
</span> + exit ;;
+ i*86:rdos:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-rdos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-rdos
</span> + exit ;;
+ i*86:AROS:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-pc-aros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-pc-aros
</span> + exit ;;
+ x86_64:VMkernel:*:*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo ${UNAME_MACHINE}-unknown-esx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$UNAME_MACHINE"-unknown-esx
</span> + exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4167,7 +4424,8 @@ index 51fab47..31e01ef 100755
</span>
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "$0: unable to guess system type" >&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4200,7 +4458,11 @@ index 51fab47..31e01ef 100755
</span> -#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++case "$UNAME_MACHINE:$UNAME_SYSTEM" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mips:Linux | mips64:Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # If we got here on MIPS GNU/Linux, output extra information.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cat >&2 <<EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4229,8 +4491,7 @@ index 51fab47..31e01ef 100755
</span> -#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "$0: unable to guess system type" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4244,11 +4505,7 @@ index 51fab47..31e01ef 100755
</span> - struct utsname un;
-
- uname(&un);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mips:Linux | mips64:Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # If we got here on MIPS GNU/Linux, output extra information.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cat >&2 <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4349,7 +4606,20 @@ index 51fab47..31e01ef 100755
</span>
config.guess timestamp = $timestamp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1452,7 +1456,7 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1443,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-UNAME_MACHINE = ${UNAME_MACHINE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-UNAME_RELEASE = ${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-UNAME_SYSTEM = ${UNAME_SYSTEM}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-UNAME_VERSION = ${UNAME_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNAME_MACHINE = "$UNAME_MACHINE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNAME_RELEASE = "$UNAME_RELEASE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNAME_SYSTEM = "$UNAME_SYSTEM"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++UNAME_VERSION = "$UNAME_VERSION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> exit 1
# Local variables:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4424,7 +4694,7 @@ index 2f41eed..6ab3008 100644
</span> #define DEFAULT_TERM "dosansi"
#else
diff --git a/config.sub b/config.sub
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ba33103..00f68b8 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ba33103..1d8e98b 100755
</span> --- a/config.sub
+++ config.sub
@@ -1,42 +1,40 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4432,10 +4702,10 @@ index ba33103..00f68b8 100755
</span> # Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright 1992-2017 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright 1992-2018 Free Software Foundation, Inc.
</span>
-timestamp='2004-03-12'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+timestamp='2017-11-23'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++timestamp='2018-02-22'
</span>
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4510,7 +4780,7 @@ index ba33103..00f68b8 100755
</span>
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright 1992-2017 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Copyright 1992-2018 Free Software Foundation, Inc.
</span>
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4529,18 +4799,23 @@ index ba33103..00f68b8 100755
</span> -- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,7 +95,7 @@ while test $# -gt 0 ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,8 +94,8 @@ while test $# -gt 0 ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> *local*)
# First pass through any local machine types.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo $1
</span> - exit 0;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "$1"
</span> + exit ;;
* )
break ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,11 +114,18 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,17 +112,24 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
</span> # Here we must recognize all the valid KERNEL-OS combinations.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
</span> 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*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4550,15 +4825,23 @@ index ba33103..00f68b8 100755
</span> + kopensolaris*-gnu* | cloudabi*-eabi* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + android-linux)
+ os=-linux-android
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $basic_machine != $1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ $basic_machine != $1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then os=`echo $1 | sed 's/.*-/-/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ "$basic_machine" != "$1" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ then os=`echo "$1" | sed 's/.*-/-/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else os=; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span> @@ -145,10 +148,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4574,7 +4857,7 @@ index ba33103..00f68b8 100755
</span> -sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,13 +169,17 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,54 +169,65 @@ case $os in
</span> os=-chorusos
basic_machine=$1
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4590,45 +4873,72 @@ index ba33103..00f68b8 100755
</span> ;;
+ -sco6)
+ os=-sco5v6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span> + ;;
-sco5)
os=-sco3.2v5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,6 +196,10 @@ case $os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't forget version if it is 3.2v4 or newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span> ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sco4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sco3.2v4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sco3.2.[4-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sco3.2v[4-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't forget version if it is 3.2v4 or newer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> -sco*)
os=-sco3.2v2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,15 +217,18 @@ case $os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -isc*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -udk*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -isc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-isc2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span> ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -clix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=clipper-intergraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -isc*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> -lynx*)
os=-lynxos
;;
-ptx*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span> - -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> -psos*)
os=-psos
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,57 +244,115 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -227,56 +244,114 @@ case $basic_machine in
</span> # Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4690,9 +5000,10 @@ index ba33103..00f68b8 100755
</span> + | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | openrisc | or32 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | open8 | or1k | or1knd | or32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | pdp10 | pdp11 | pj | pjl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | pdp10 | pdp11 | pj | pjl \
</span> - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ | open8 | or1k | or1knd | or32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | pdp10 | pj | pjl \
</span> + | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4719,10 +5030,8 @@ index ba33103..00f68b8 100755
</span> + | wasm32 \
+ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=$basic_machine-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m6811 | m68hc11 | m6812 | m68hc12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Motorola 68HC11/12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=$basic_machine-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + c54x)
+ basic_machine=tic54x-unknown
+ ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4737,32 +5046,41 @@ index ba33103..00f68b8 100755
</span> + ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os=-none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + ms1)
+ basic_machine=mt-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m6811 | m68hc11 | m6812 | m68hc12)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Motorola 68HC11/12.
</span> +
+ strongarm | thumb | xscale)
+ basic_machine=arm-unknown
+ ;;
+ xgate)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=$basic_machine-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os=-none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=$basic_machine-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
</span> + xscaleeb)
+ basic_machine=armeb-unknown
+ ;;
+
+ xscaleel)
+ basic_machine=armel-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span>
# We use `pc' rather than `unknown'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # because (1) that's what they normally are, and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -293,59 +368,91 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,70 +362,102 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Object if more than one company name word.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> # Recognize the basic CPU types with company name.
580-* \
| a29k-* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4876,6 +5194,12 @@ index ba33103..00f68b8 100755
</span> ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 386bsd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=i386-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i386-pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
</span> @@ -363,7 +470,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4885,6 +5209,15 @@ index ba33103..00f68b8 100755
</span> basic_machine=abacus-unknown
;;
adobe68k)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -384,7 +491,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=x86_64-pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amd64-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amdahl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=580-amdahl
</span> @@ -409,6 +516,13 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4908,7 +5241,7 @@ index ba33103..00f68b8 100755
</span> + os=-linux
+ ;;
+ blackfin-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + os=-linux
+ ;;
+ bluegene*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4916,13 +5249,13 @@ index ba33103..00f68b8 100755
</span> + os=-cnk
+ ;;
+ c54x-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + ;;
+ c55x-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + ;;
+ c6x-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + ;;
c90)
basic_machine=c90-cray
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4984,39 +5317,76 @@ index ba33103..00f68b8 100755
</span> + os=$os"spe"
+ ;;
+ e500v[12]-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + os=$os"spe"
+ ;;
ebmon29k)
basic_machine=a29k-amd
os=-ebmon
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -592,7 +754,6 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -578,9 +740,6 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=hppa1.0-hp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hppa-next)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-nextstep3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hppaosf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=hppa1.1-hp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-osf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,28 +751,27 @@ case $basic_machine in
</span> i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
</span> os=-sysv32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -631,6 +792,17 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i*86v4*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i*86v)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i*86sol2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-solaris2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386mach)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=i386-mach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-mach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- i386-vsta | vsta)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vsta)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=i386-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-vsta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -631,8 +789,16 @@ case $basic_machine in
</span> basic_machine=m68k-isi
os=-sysv
;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- m88k-omron*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=m88k-omron
</span> + leon-*|leon[3-9]-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
</span> + ;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + os=-linux
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m88k-omron*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=m88k-omron
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,10 +814,21 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ magnum | m3230)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=mips-mips
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -642,10 +808,21 @@ case $basic_machine in
</span> basic_machine=ns32k-utek
os=-sysv
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5039,18 +5409,24 @@ index ba33103..00f68b8 100755
</span> miniframe)
basic_machine=m68000-convergent
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -659,10 +842,6 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mips3*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -654,14 +831,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-mint
</span> ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mips3*-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mips3*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span> - mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> monitor)
basic_machine=m68k-rom68k
<span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-coff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -671,14 +850,29 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -671,14 +844,29 @@ case $basic_machine in
</span> basic_machine=powerpc-unknown
os=-morphos
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5063,7 +5439,7 @@ index ba33103..00f68b8 100755
</span> os=-msdos
;;
+ ms1-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
</span> + ;;
+ msys)
+ basic_machine=i686-pc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5080,7 +5456,7 @@ index ba33103..00f68b8 100755
</span> ncr3000)
basic_machine=i486-ncr
os=-sysv4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -707,7 +901,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -707,7 +895,7 @@ case $basic_machine in
</span> basic_machine=v70-nec
os=-sysv
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5089,7 +5465,7 @@ index ba33103..00f68b8 100755
</span> basic_machine=m68k-next
case $os in
-nextstep* )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -743,20 +937,24 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -743,20 +931,27 @@ case $basic_machine in
</span> np1)
basic_machine=np1-gould
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5105,6 +5481,9 @@ index ba33103..00f68b8 100755
</span> nsr-tandem)
basic_machine=nsr-tandem
;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ nsv-tandem)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=nsv-tandem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5119,7 +5498,7 @@ index ba33103..00f68b8 100755
</span> ;;
os400)
basic_machine=powerpc-ibm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -778,6 +976,14 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -778,6 +973,14 @@ case $basic_machine in
</span> basic_machine=i860-intel
os=-osf
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5128,13 +5507,13 @@ index ba33103..00f68b8 100755
</span> + os=-linux
+ ;;
+ parisc-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -787,6 +993,12 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -787,6 +990,12 @@ case $basic_machine in
</span> pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5142,12 +5521,32 @@ index ba33103..00f68b8 100755
</span> + basic_machine=i386-pc
+ ;;
+ pc98-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -816,11 +1028,12 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -800,41 +1009,42 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=i786-pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pentium4-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pn)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=pn-gould
</span> ;;
power) basic_machine=power-ibm
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5156,23 +5555,32 @@ index ba33103..00f68b8 100755
</span> ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc-* | ppcbe-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -830,7 +1043,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64) basic_machine=powerpc64-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -843,6 +1056,14 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ps2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=i386-ibm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -843,6 +1053,14 @@ case $basic_machine in
</span> basic_machine=i586-unknown
os=-pw32
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5187,7 +5595,7 @@ index ba33103..00f68b8 100755
</span> rom68k)
basic_machine=m68k-rom68k
os=-coff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -869,6 +1090,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -869,6 +1087,10 @@ case $basic_machine in
</span> sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5198,27 +5606,35 @@ index ba33103..00f68b8 100755
</span> sei)
basic_machine=mips-sei
os=-seiux
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -880,6 +1105,9 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=sh-hitachi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-hms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -876,14 +1098,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sequent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=i386-sequent
</span> ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- sh)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=sh-hitachi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-hms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sh64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=sh64-unknown
</span> + sh5el)
+ basic_machine=sh5le-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sh64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=sh64-unknown
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -901,6 +1129,9 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sparclite-wrs | simso-wrs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ simso-wrs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=sparclite-wrs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-vxworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -901,6 +1119,9 @@ case $basic_machine in
</span> basic_machine=i860-stratus
os=-sysv4
;;
+ strongarm-* | thumb-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
</span> + ;;
sun2)
basic_machine=m68000-sun
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -957,17 +1188,9 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -957,17 +1178,9 @@ case $basic_machine in
</span> basic_machine=t90-cray
os=-unicos
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5239,17 +5655,7 @@ index ba33103..00f68b8 100755
</span> ;;
tx39)
basic_machine=mipstx39-unknown
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1021,6 +1244,9 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=a29k-wrs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-vxworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wasm32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=wasm32-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- w65*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=w65-wdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1029,9 +1255,19 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1029,17 +1242,23 @@ case $basic_machine in
</span> basic_machine=hppa1.1-winbond
os=-proelf
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5264,23 +5670,20 @@ index ba33103..00f68b8 100755
</span> basic_machine=xps100-honeywell
;;
+ xscale-* | xscalee[bl]-*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
</span> + ;;
ymp)
basic_machine=ymp-cray
os=-unicos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1040,6 +1276,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=z8k-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-sim
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ z80-*-coff)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic_machine=z80-unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os=-sim
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- z8k-*-coff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=z8k-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-sim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span> none)
basic_machine=none-none
os=-none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1059,6 +1299,9 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1059,31 +1278,24 @@ case $basic_machine in
</span> romp)
basic_machine=romp-ibm
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5290,7 +5693,16 @@ index ba33103..00f68b8 100755
</span> rs6000)
basic_machine=rs6000-ibm
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1075,13 +1318,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vax)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=vax-dec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pdp10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # there are many clones, so DEC is not a safe bet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=pdp10-unknown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pdp11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=pdp11-dec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> we32k)
basic_machine=we32k-att
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5302,11 +5714,34 @@ index ba33103..00f68b8 100755
</span> - basic_machine=sh64-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basic_machine=sparc-sun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=sparc-sun
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span> cydra)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1125,9 +1365,12 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basic_machine=cydra-cydrome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1103,7 +1315,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure to match an already-canonicalized machine name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1111,10 +1323,10 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Here we canonicalize certain aliases for manufacturers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-digital*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-commodore*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1125,49 +1337,60 @@ esac
</span> if [ x"$os" != x"" ]
then
case $os in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5321,11 +5756,23 @@ index ba33103..00f68b8 100755
</span> -solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1143,31 +1386,37 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -solaris)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-solaris2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -svr4*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -unixware*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv4.2uw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> -gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # First accept the basic system types.
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ # es1800 is here to avoid being matched by es* (a different OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -es1800*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os=-ose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span> + # Now accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5343,7 +5790,7 @@ index ba33103..00f68b8 100755
</span> | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
</span> + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5352,33 +5799,53 @@ index ba33103..00f68b8 100755
</span> - | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
</span> + | -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* \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
</span> | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
</span> - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -morphos* | -superux* | -rtmk* | -windiss* \
</span> + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -midnightbsd*)
</span> # Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1185,7 +1434,7 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1184,12 +1407,12 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -nto*)
</span> os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
</span> - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -sim | -xray | -os68k* | -v88r* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | -windows* | -osx | -abug | -netware* | -os9* \
</span> | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1206,7 +1455,7 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=`echo $os | sed -e 's|mac|macos|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os=`echo "$os" | sed -e 's|mac|macos|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -linux-dietlibc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-linux-dietlibc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1198,26 +1421,20 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sunos5*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=`echo $os | sed -e 's|sunos5|solaris2|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sunos6*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=`echo $os | sed -e 's|sunos6|solaris3|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> -opened*)
os=-openedition
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5387,7 +5854,18 @@ index ba33103..00f68b8 100755
</span> os=-os400
;;
-wince*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1242,7 +1491,7 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-wince
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -osfrose*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-osfrose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -osf*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-osf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -utek*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-bsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1242,7 +1459,7 @@ case $os in
</span> -nova*)
os=-rtmk-nova
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5396,7 +5874,7 @@ index ba33103..00f68b8 100755
</span> os=-nextstep2
;;
-nsk*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1255,7 +1504,7 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1255,7 +1472,7 @@ case $os in
</span> -sinix*)
os=-sysv4
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5405,18 +5883,38 @@ index ba33103..00f68b8 100755
</span> os=-tpf
;;
-triton*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1291,8 +1540,28 @@ case $os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -aros*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os=-aros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1264,7 +1481,7 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -oss*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv3
</span> ;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- -kaos*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os=-kaos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -svr4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -svr4*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -svr3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1279,27 +1496,38 @@ case $os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ose*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-ose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -es1800*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-ose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -xenix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-xenix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-mint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -aros*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-aros
</span> + -zvmoe)
+ os=-zvmoe
+ ;;
+ -dicos*)
+ os=-dicos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -kaos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-kaos
</span> + -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5436,7 +5934,15 @@ index ba33103..00f68b8 100755
</span> ;;
-none)
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1316,6 +1585,12 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get rid of the `-' at the beginning of $os.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=`echo $os | sed 's/[^-]*-//'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1316,6 +1544,12 @@ else
</span> # system, and we'll never get to this point.
case $basic_machine in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5449,7 +5955,7 @@ index ba33103..00f68b8 100755
</span> *-acorn)
os=-riscix1.2
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1325,9 +1600,24 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1325,9 +1559,24 @@ case $basic_machine in
</span> arm*-semi)
os=-aout
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5477,7 +5983,7 @@ index ba33103..00f68b8 100755
</span> # This must come before the *-dec entry.
pdp10-*)
os=-tops20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1346,13 +1636,13 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1346,13 +1595,13 @@ case $basic_machine in
</span> ;;
m68000-sun)
os=-sunos3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5494,7 +6000,7 @@ index ba33103..00f68b8 100755
</span> mips*-cisco)
os=-elf
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1368,12 +1658,21 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,12 +1617,18 @@ case $basic_machine in
</span> sparc-* | *-sun)
os=-sunos4.1.1
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5504,9 +6010,6 @@ index ba33103..00f68b8 100755
</span> *-be)
os=-beos
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-haiku)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os=-haiku
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span> *-ibm)
os=-aix
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5516,7 +6019,7 @@ index ba33103..00f68b8 100755
</span> *-wec)
os=-proelf
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1407,7 +1706,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1407,7 +1662,7 @@ case $basic_machine in
</span> m88k-omron*)
os=-luna
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5525,7 +6028,17 @@ index ba33103..00f68b8 100755
</span> os=-nextstep
;;
*-sequent)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1476,7 +1775,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1422,9 +1677,6 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i370-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-mvs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-next)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os=-nextstep3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-gould)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os=-sysv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1476,7 +1728,7 @@ case $basic_machine in
</span> -sunos*)
vendor=sun
;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5534,11 +6047,18 @@ index ba33103..00f68b8 100755
</span> vendor=ibm
;;
-beos*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1539,10 +1838,10 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1534,15 +1786,15 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vendor=stratus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $basic_machine$os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo $basic_machine$os
</span> -exit 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>++echo "$basic_machine$os"
</span> +exit
# Local variables:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5861,7 +6381,7 @@ index 8020f6d..705e277 100644
</span> if (cookie->commentURL->length == 0)
cookie->commentURL = NULL;
diff --git a/display.c b/display.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e00eb0c..f1d6f99 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e00eb0c..e62d07f 100644
</span> --- a/display.c
+++ display.c
@@ -257,7 +257,7 @@ make_lastline_link(Buffer *buf, char *title, char *url)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5882,7 +6402,18 @@ index e00eb0c..f1d6f99 100644
</span> drawImage();
}
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -521,7 +521,15 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -497,6 +497,10 @@ displayBuffer(Buffer *buf, int mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ save_current_buf = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mode == B_FORCE_REDRAW && (buf->check_url & CHK_URL) ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chkURLBuffer(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ displayBuffer(buf, B_NORMAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -521,7 +525,15 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
</span> break;
}
if (hseq >= 0 && an->hseq == hseq) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5898,7 +6429,7 @@ index e00eb0c..f1d6f99 100644
</span> if (l->propBuf[i] & (PE_IMAGE | PE_ANCHOR | PE_FORM)) {
if (active)
l->propBuf[i] |= PE_ACTIVE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,9 +537,9 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -529,9 +541,9 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
</span> l->propBuf[i] &= ~PE_ACTIVE;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5910,7 +6441,7 @@ index e00eb0c..f1d6f99 100644
</span> }
else if (prevhseq >= 0 && an->hseq == prevhseq) {
if (active)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -855,14 +863,16 @@ redrawLineImage(Buffer *buf, Line *l, int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -855,14 +867,16 @@ redrawLineImage(Buffer *buf, Line *l, int i)
</span> 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);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5935,7 +6466,7 @@ index e00eb0c..f1d6f99 100644
</span> if (image->width > 0)
w = image->width - sx;
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1119,18 +1129,18 @@ addChar(char c, Lineprop mode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1119,18 +1133,18 @@ addChar(char c, Lineprop mode)
</span> }
#ifdef USE_M17N
if (w == 2 && WcOption.use_wide)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13847,18 +14378,80 @@ index 324ea3e..60d6d19 100644
</span> http://w3m.sourceforge.net/
+ https://sourceforge.net/projects/w3m/
diff --git a/doc/README.cookie b/doc/README.cookie
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 56cca50..da16947 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 56cca50..71523e0 100644
</span> --- a/doc/README.cookie
+++ doc/README.cookie
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,21 +9,21 @@ cookie support of w3m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-12.txt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cookie.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * If you wont to disable cookie support, run configure script with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * If you want to disable cookie support, run the configure script with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-cookie option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You can choose to use cookie or not on the Option Setting Panel or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * You can choose to use cookies or not on the Option Setting Panel or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cookie and -no-cookie option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You can disable cookie on the Option Setting Panel. In this case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- all cookies are rejected, however, cookies which accepted before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- disable cookie are used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * You can disable cookies on the Option Setting Panel. In this case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ all new cookies are rejected, however, cookies which were accepted before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cookies were disabled are used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You can see list of accepted cookies with C-k. In this panel, you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * You can see the list of accepted cookies with C-k. In this panel, you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ can choose to use each cookie or not.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * You can specify domains accept or not accept cookies on the Option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Setting Panel. Domains are specified with following format.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * You can specify domains from which to accept or not accept cookies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ on the Option Setting Panel. Domains are specified in the following format:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ domain-list = domains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | ""
</span> @@ -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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * If the number of "." in domain name is lesser than 2, it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * If the number of "." in domain name is fewer than 2, it is
</span> 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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc/README.dict b/doc/README.dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd82cdb..88f4b1a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/doc/README.dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/README.dict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,14 +2,14 @@ Dictionary look-up hack for w3m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1. INTRODUCTION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-If you have dictionary look-up command (like 'webster'), you can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-look a word in a document using w3m. This dictionary-lookup code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++If you have a dictionary look-up command (such as 'webster'), you can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++look up words in a document using w3m. This dictionary-lookup code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ was contributed by `Rubikitch' (rubikitch@ruby-lang.org), and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-further modifed by Tushar Samant (scribble at pobox.com).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++further modified by Tushar Samant (scribble at pobox.com).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2. INSTALLATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-To make use of dictionary look-up, you currently must change a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++To make use of the dictionary look-up, you currently must change a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compile option by hand. After running configure, edit config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@ to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_DICT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-and recompile w3me (i.e. type "make install").
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and recompile w3m (i.e. type "make install").
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note that w3m/0.3+cvs-1.373 or later, USE_DICT is defined by default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Then find or install a CGI program which takes a word as a query
</span> diff --git a/doc/README.func b/doc/README.func
index 0b2c034..a3ef3ac 100644
--- a/doc/README.func
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14137,9 +14730,20 @@ index 0b2c034..a3ef3ac 100644
</span> +WHEREIS Search forward
+WRAP_TOGGLE Toggle wrapping mode in searches
diff --git a/doc/README.img b/doc/README.img
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c10114..f11362f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0c10114..af6d9db 100644
</span> --- a/doc/README.img
+++ doc/README.img
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,8 +11,8 @@ Introduction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Display inline image (GIF,PNG,JPEG, etc.) on terminals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (xterm,rxvt, etc.) of X11, Linux framebuffer device or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Display inline images (GIF, PNG, JPEG, etc.) on terminals
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (xterm, rxvt, etc.) of X11, Linux framebuffer device or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ terminals of Windows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Support inline image of <img> tag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Support of attributes "width", "height", and "align".
</span> @@ -41,7 +41,7 @@ Key functions
Specify the following keymaps in ~/.w3m/keymap.
keymap X DISPLAY_IMAGE
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14149,6 +14753,53 @@ index 0c10114..f11362f 100644
</span>
Commandline options
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@ Option panel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Automatic loading of inline image. The default is ON.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If it is OFF, loading starts with a command DISPLAY_IMAGE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_load_image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Maximum process for downloading of inline image. The default is 4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Maximum # of processes for downloading inline images. The default is 4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 to 8 can be set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext_image_viewer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Use external image viewer, when a command VIEW_IMAGE or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,8 +75,8 @@ Option panel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image_scale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Scale of image (%). The default value is 100(%).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ imgdisplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- External command to display image". The default value is "w3mimgdisplay".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- See "Setting w3mimgdisplay".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ External command to display image. The default value is "w3mimgdisplay".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ See "Setting w3mimgdisplay."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Required programs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,8 +124,8 @@ Setting w3mimgdisplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The default value for Linux framebuffer device is #000000 (black).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ When the color is specified as #RRGGBB, escape '#'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -anim <n>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Maximum number of frames for animation. It means without limit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if the number is 0. Negative value count backward from the end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Maximum number of frames for animation. It will run everything
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if the number is 0. Negative values count backward from the end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ of the frames. The default value is 100.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -margin <n>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Margin of an area to clear an image. The default value is 0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,13 +135,13 @@ Setting w3mimgdisplay
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Notice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ If you want to see GIF animation, please hit a suitable key, such
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as 'h', 'l', etc., repeatedly, because a frame is rewritten
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ as 'h', 'l', etc., repeatedly, because a new frame is only requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ according to the re-drawing demand from w3m.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Some code in w3mimg/fb/fb.c was originally written by Mr. Yamasaki.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.sainet.or.jp/~yamasaki/download/fb-sample.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- On Windows, we check the behaver on standard console, Cygwin rxvt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ On Windows, we check the behavior on standard console, Cygwin rxvt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and PuTTY.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/doc/README.m17n b/doc/README.m17n
index c064d76..da5408b 100644
--- a/doc/README.m17n
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14162,6 +14813,57 @@ index c064d76..da5408b 100644
</span> 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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/doc/README.pre_form b/doc/README.pre_form
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 972ef90..dad62f8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/doc/README.pre_form
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/README.pre_form
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pre_form: Feature to configure form parameters when opening specific site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pre_form: Feature to pre-fill form parameters when opening a specific site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-It would be convinient for sites where you often visit, but it may introduce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-some security issues. Be careful to use this feature, especially `submit'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++It is convenient for sites that you visit often, but it may introduce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++some security issues. Be careful when using this feature, especially `submit'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ params described below.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Default configuration file for pre_form is ~/.w3m/pre_form.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Syntax as follows:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++The syntax of entries in the configuration file is as follows:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ url <url>|/<re-url>/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ form [<name>] <action>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,21 +23,21 @@ textarea <name>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /textarea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-If <action> is set, form which has matched <action> attributes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++If <action> is set, a form which has matched <action> attributes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ will be configured by this pre_form.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The line begining with text, file, passwd, select, textarea means that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++A line beginning with text, file, passwd, select, textarea means that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it will set value to <value> in input, select or textarea element which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name attribute matches with <name>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The line beginning with checkbox, radio means that it will check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++A line beginning with checkbox, radio means that it will check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input element which name and value attribute matches with <name> and <value>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-respectively. If <checked> is 0, no, or off, disable check of the checkbox.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++respectively. If <checked> is 0, no, or off, the checkbox will be unchecked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The line beginning with submit or image means that it will submit input
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-element which name attribute matches with <name> (and value attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-matches with <value>), or submit last <input type=submit> element if no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<name> specified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++A line beginning with submit or image means that it will submit input
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++element whose name attribute matches with <name> (and value attribute
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++matches with <value>), or submit on the last <input type=submit> element if no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<name> was specified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You quote \, ' (single-quote) or " (double quote) as you do in shell.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/doc/README.siteconf b/doc/README.siteconf
new file mode 100644
index 0000000..39b1028
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14817,7 +15519,7 @@ index 8fe1215..37c4f15 100644
</span> QuietMessage = TRUE;
fmInitialized = FALSE;
diff --git a/file.c b/file.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 567d41e..9b0e947 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 567d41e..0333e9a 100644
</span> --- a/file.c
+++ file.c
@@ -26,6 +26,8 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14928,7 +15630,20 @@ index 567d41e..9b0e947 100644
</span> int
matchattr(char *p, char *attr, int len, Str *value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,6 +679,7 @@ readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -626,8 +611,10 @@ readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(w3m_reqlog){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *ff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ff = fopen(w3m_reqlog, "a");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Strfputs(tmp, ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fclose(ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(ff){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Strfputs(tmp, ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fclose(ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (src)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Strfputs(tmp, src);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,6 +681,7 @@ readHeader(URLFile *uf, Buffer *newBuf, int thru, ParsedURL *pu)
</span> #endif
init_stream(&f, SCM_LOCAL, newStrStream(src));
loadHTMLstream(&f, newBuf, NULL, TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14936,7 +15651,7 @@ index 567d41e..9b0e947 100644
</span> for (l = newBuf->lastLine; l && l->real_linenumber;
l = l->prev)
l->real_linenumber = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1244,6 +1230,7 @@ AuthDigestCred(struct http_auth *ha, Str uname, Str pw, ParsedURL *pu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1244,6 +1232,7 @@ AuthDigestCred(struct http_auth *ha, Str uname, Str pw, ParsedURL *pu,
</span> unsigned char md5[MD5_DIGEST_LENGTH + 1];
Str uri = HTTPrequestURI(pu, hr);
char nc[] = "00000001";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14944,7 +15659,7 @@ index 567d41e..9b0e947 100644
</span>
Str algorithm = qstr_unquote(get_auth_param(ha->param, "algorithm"));
Str nonce = qstr_unquote(get_auth_param(ha->param, "nonce"));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1326,10 +1313,11 @@ AuthDigestCred(struct http_auth *ha, Str uname, Str pw, ParsedURL *pu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1326,10 +1315,11 @@ AuthDigestCred(struct http_auth *ha, Str uname, Str pw, ParsedURL *pu,
</span> /* A2 = Method ":" digest-uri-value ":" H(entity-body) */
if (request && request->body) {
if (request->method == FORM_METHOD_POST && request->enctype == FORM_ENCTYPE_MULTIPART) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14957,7 +15672,7 @@ index 567d41e..9b0e947 100644
</span> MD5(ebody->ptr, strlen(ebody->ptr), md5);
}
else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1697,13 +1685,15 @@ getLinkNumberStr(int correction)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1697,13 +1687,15 @@ getLinkNumberStr(int correction)
</span> /*
* loadGeneralFile: load file to buffer
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14974,7 +15689,7 @@ index 567d41e..9b0e947 100644
</span> char *volatile tpath;
char *volatile t = "text/plain", *p, *volatile real_type = NULL;
Buffer *volatile t_buf = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1730,7 +1720,22 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1730,7 +1722,22 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> add_auth_cookie_flag = 0;
checkRedirection(NULL);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14997,7 +15712,7 @@ index 567d41e..9b0e947 100644
</span> TRAP_OFF;
url_option.referer = referer;
url_option.flag = flag;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1863,7 +1868,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1863,7 +1870,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> /* 302: Found */
/* 303: See Other */
/* 307: Temporary Redirect (HTTP/1.1) */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15006,7 +15721,7 @@ index 567d41e..9b0e947 100644
</span> request = NULL;
UFclose(&f);
current = New(ParsedURL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2022,7 +2027,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2022,7 +2029,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> if (f.is_cgi && (p = checkHeader(t_buf, "Location:")) != NULL &&
checkRedirection(&pu)) {
/* document moved */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15015,7 +15730,7 @@ index 567d41e..9b0e947 100644
</span> request = NULL;
UFclose(&f);
add_auth_cookie_flag = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2123,10 +2128,6 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2123,10 +2130,6 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> if (real_type == NULL)
real_type = t;
proc = loadBuffer;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15026,7 +15741,7 @@ index 567d41e..9b0e947 100644
</span>
current_content_length = 0;
if ((p = checkHeader(t_buf, "Content-Length:")) != NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2197,18 +2198,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2197,18 +2200,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> #endif
else if (w3m_backend) ;
else if (!(w3m_dump & ~DUMP_FRAME) || is_dump_text_type(t)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15047,7 +15762,7 @@ index 567d41e..9b0e947 100644
</span> }
else {
TRAP_OFF;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2232,36 +2223,30 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2232,36 +2225,30 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> else if (w3m_dump & DUMP_FRAME)
return NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15098,7 +15813,7 @@ index 567d41e..9b0e947 100644
</span> if (pu.label) {
if (proc == loadHTMLBuffer) {
Anchor *a;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2287,10 +2272,11 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2287,10 +2274,11 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
</span> if (header_string)
header_string = NULL;
#ifdef USE_NNTP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15112,7 +15827,7 @@ index 567d41e..9b0e947 100644
</span> TRAP_OFF;
return b;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2325,8 +2311,12 @@ push_link(int cmd, int offset, int pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2325,8 +2313,12 @@ push_link(int cmd, int offset, int pos)
</span> struct link_stack *p;
p = New(struct link_stack);
p->cmd = cmd;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15127,7 +15842,7 @@ index 567d41e..9b0e947 100644
</span> p->next = link_stack;
link_stack = p;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2469,6 +2459,7 @@ set_breakpoint(struct readbuffer *obuf, int tag_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2469,6 +2461,7 @@ set_breakpoint(struct readbuffer *obuf, int tag_length)
</span> bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor,
sizeof(obuf->anchor));
obuf->bp.img_alt = obuf->img_alt;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15135,7 +15850,7 @@ index 567d41e..9b0e947 100644
</span> obuf->bp.in_bold = obuf->in_bold;
obuf->bp.in_italic = obuf->in_italic;
obuf->bp.in_under = obuf->in_under;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2486,6 +2477,7 @@ back_to_breakpoint(struct readbuffer *obuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2486,6 +2479,7 @@ back_to_breakpoint(struct readbuffer *obuf)
</span> bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor,
sizeof(obuf->anchor));
obuf->img_alt = obuf->bp.img_alt;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15143,7 +15858,7 @@ index 567d41e..9b0e947 100644
</span> obuf->in_bold = obuf->bp.in_bold;
obuf->in_italic = obuf->bp.in_italic;
obuf->in_under = obuf->bp.in_under;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2729,7 +2721,7 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2729,7 +2723,7 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span> Str line = obuf->line, pass = NULL;
char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL,
*hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15152,7 +15867,7 @@ index 567d41e..9b0e947 100644
</span>
#ifdef DEBUG
if (w3m_debug) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2761,6 +2753,12 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2761,6 +2755,12 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span> hidden = hidden_img;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15165,7 +15880,7 @@ index 567d41e..9b0e947 100644
</span> if (obuf->in_bold) {
if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) {
if (!hidden || hidden_bold < hidden)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2812,6 +2810,8 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2812,6 +2812,8 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span> Strcat_charp(line, "</a>");
if (obuf->img_alt && !hidden_img)
Strcat_charp(line, "</img_alt>");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15174,7 +15889,7 @@ index 567d41e..9b0e947 100644
</span> if (obuf->in_bold && !hidden_bold)
Strcat_charp(line, "</b>");
if (obuf->in_italic && !hidden_italic)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3022,6 +3022,18 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3022,6 +3024,18 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent,
</span> Strcat_charp(tmp, "\">");
push_tag(obuf, tmp->ptr, HTML_IMG_ALT);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15193,7 +15908,7 @@ index 567d41e..9b0e947 100644
</span> if (!hidden_bold && obuf->in_bold)
push_tag(obuf, "<B>", HTML_B);
if (!hidden_italic && obuf->in_italic)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3228,7 +3240,7 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3228,7 +3242,7 @@ process_img(struct parsed_tag *tag, int width)
</span>
if (!parsedtag_get_value(tag, ATTR_SRC, &p))
return tmp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15202,7 +15917,7 @@ index 567d41e..9b0e947 100644
</span> q = NULL;
parsedtag_get_value(tag, ATTR_ALT, &q);
if (!pseudoInlines && (q == NULL || (*q == '\0' && ignore_null_img_alt)))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3255,9 +3267,9 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3255,9 +3269,9 @@ process_img(struct parsed_tag *tag, int width)
</span> }
#endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15213,7 +15928,7 @@ index 567d41e..9b0e947 100644
</span> if (parsedtag_get_value(tag, ATTR_HEIGHT, &i)) {
if (i > 0) {
i = (int)(i * image_scale / 100 + 0.5);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3322,12 +3334,7 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3322,12 +3336,7 @@ process_img(struct parsed_tag *tag, int width)
</span> Image image;
ParsedURL u;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15226,7 +15941,7 @@ index 567d41e..9b0e947 100644
</span> image.url = parsedURL2Str(&u)->ptr;
if (!uncompressed_file_type(u.file, &image.ext))
image.ext = filename_extension(u.file, TRUE);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3346,8 +3353,14 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3346,8 +3355,14 @@ process_img(struct parsed_tag *tag, int width)
</span> if (i < 0)
i = pixel_per_line;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15243,7 +15958,7 @@ index 567d41e..9b0e947 100644
</span> Strcat(tmp,
Sprintf("<pre_int><img_alt hseq=\"%d\" src=\"", cur_iseq++));
pre_int = TRUE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3378,19 +3391,21 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3378,19 +3393,21 @@ process_img(struct parsed_tag *tag, int width)
</span> if (i0 >= 0)
Strcat(tmp, Sprintf(" height=%d", i0));
switch (align) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15273,7 +15988,7 @@ index 567d41e..9b0e947 100644
</span> case ALIGN_BOTTOM:
top = ni - 1;
bottom = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3408,7 +3423,12 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3408,7 +3425,12 @@ process_img(struct parsed_tag *tag, int width)
</span> }
break;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15287,7 +16002,7 @@ index 567d41e..9b0e947 100644
</span> if (xoffset)
Strcat(tmp, Sprintf(" xoffset=%d", xoffset));
if (yoffset)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3435,7 +3455,7 @@ process_img(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3435,7 +3457,7 @@ process_img(struct parsed_tag *tag, int width)
</span> if (use_image) {
if (n > nw) {
char *r;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15296,7 +16011,7 @@ index 567d41e..9b0e947 100644
</span> if (n + get_mcwidth(r) > nw)
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3548,7 +3568,7 @@ process_anchor(struct parsed_tag *tag, char *tagbuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3548,7 +3570,7 @@ process_anchor(struct parsed_tag *tag, char *tagbuf)
</span> Str
process_input(struct parsed_tag *tag)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15305,7 +16020,7 @@ index 567d41e..9b0e947 100644
</span> char *q, *p, *r, *p2, *s;
Str tmp = NULL;
char *qq = "";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3567,9 +3587,9 @@ process_input(struct parsed_tag *tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3567,9 +3589,9 @@ process_input(struct parsed_tag *tag)
</span> parsedtag_get_value(tag, ATTR_VALUE, &q);
r = "";
parsedtag_get_value(tag, ATTR_NAME, &r);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15318,7 +16033,7 @@ index 567d41e..9b0e947 100644
</span> parsedtag_get_value(tag, ATTR_MAXLENGTH, &i);
p2 = NULL;
parsedtag_get_value(tag, ATTR_ALT, &p2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3623,9 +3643,10 @@ process_input(struct parsed_tag *tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3623,9 +3645,10 @@ process_input(struct parsed_tag *tag)
</span> Strcat(tmp, getLinkNumberStr(0));
Strcat_char(tmp, '(');
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15331,7 +16046,7 @@ index 567d41e..9b0e947 100644
</span> if (x)
Strcat_charp(tmp, " checked");
if (y)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3670,18 +3691,18 @@ process_input(struct parsed_tag *tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3670,18 +3693,18 @@ process_input(struct parsed_tag *tag)
</span> case FORM_INPUT_PASSWORD:
i = 0;
if (q) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15354,7 +16069,7 @@ index 567d41e..9b0e947 100644
</span> Strcat_char(tmp, ' ');
}
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3731,6 +3752,75 @@ process_input(struct parsed_tag *tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3731,6 +3754,75 @@ process_input(struct parsed_tag *tag)
</span> return tmp;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15430,7 +16145,7 @@ index 567d41e..9b0e947 100644
</span> Str
process_select(struct parsed_tag *tag)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3926,7 +4016,7 @@ process_textarea(struct parsed_tag *tag, int width)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3926,7 +4018,7 @@ process_textarea(struct parsed_tag *tag, int width)
</span> cur_textarea_size = 20;
if (parsedtag_get_value(tag, ATTR_COLS, &p)) {
cur_textarea_size = atoi(p);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15439,7 +16154,7 @@ index 567d41e..9b0e947 100644
</span> cur_textarea_size = width * cur_textarea_size / 100 - 2;
if (cur_textarea_size <= 0) {
cur_textarea_size = 20;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4003,7 +4093,9 @@ feed_textarea(char *str)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4003,7 +4095,9 @@ feed_textarea(char *str)
</span> Strcat_charp(textarea_str[n_textarea], "\r\n");
str++;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15450,7 +16165,7 @@ index 567d41e..9b0e947 100644
</span> Strcat_char(textarea_str[n_textarea], *(str++));
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4084,6 +4176,7 @@ process_form_int(struct parsed_tag *tag, int fid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4084,6 +4178,7 @@ process_form_int(struct parsed_tag *tag, int fid)
</span> parsedtag_get_value(tag, ATTR_METHOD, &p);
q = "!CURRENT_URL!";
parsedtag_get_value(tag, ATTR_ACTION, &q);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15458,7 +16173,7 @@ index 567d41e..9b0e947 100644
</span> r = NULL;
#ifdef USE_M17N
if (parsedtag_get_value(tag, ATTR_ACCEPT_CHARSET, &r))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4113,7 +4206,7 @@ process_form_int(struct parsed_tag *tag, int fid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4113,7 +4208,7 @@ process_form_int(struct parsed_tag *tag, int fid)
</span> forms = New_N(FormList *, forms_size);
form_stack = NewAtom_N(int, forms_size);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15467,7 +16182,7 @@ index 567d41e..9b0e947 100644
</span> forms_size += form_max;
forms = New_Reuse(FormList *, forms, forms_size);
form_stack = New_Reuse(int, form_stack, forms_size);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4284,15 +4377,16 @@ getMetaRefreshParam(char *q, Str *refresh_uri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4284,15 +4379,16 @@ getMetaRefreshParam(char *q, Str *refresh_uri)
</span> while (*q) {
if (!strncasecmp(q, "url=", 4)) {
q += 4;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15487,7 +16202,7 @@ index 567d41e..9b0e947 100644
</span> s_tmp->length--;
s_tmp->ptr[s_tmp->length] = '\0';
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4599,6 +4693,12 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4599,6 +4695,12 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> case HTML_DD:
CLOSE_A;
CLOSE_DT;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15500,7 +16215,7 @@ index 567d41e..9b0e947 100644
</span> if (envs[h_env->envc].env == HTML_DL_COMPACT) {
if (obuf->pos > envs[h_env->envc].indent)
flushline(h_env, obuf, envs[h_env->envc].indent, 0,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4833,13 +4933,13 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4833,13 +4935,13 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> #ifdef USE_IMAGE
i = 0;
if (parsedtag_get_value(tag, ATTR_TOP_MARGIN, &i)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15518,7 +16233,7 @@ index 567d41e..9b0e947 100644
</span> }
#endif
return 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4853,15 +4953,43 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4853,15 +4955,43 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> case HTML_INPUT_ALT:
i = 0;
if (parsedtag_get_value(tag, ATTR_TOP_MARGIN, &i)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15566,7 +16281,7 @@ index 567d41e..9b0e947 100644
</span> case HTML_TABLE:
close_anchor(h_env, obuf);
obuf->table_level++;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4884,6 +5012,8 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4884,6 +5014,8 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> else
w = BORDER_THIN;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15575,7 +16290,7 @@ index 567d41e..9b0e947 100644
</span> if (parsedtag_get_value(tag, ATTR_WIDTH, &i)) {
if (obuf->table_level == 0)
width = REAL_WIDTH(i, h_env->limit - envs[h_env->envc].indent);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4892,9 +5022,24 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4892,9 +5024,24 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> }
if (parsedtag_exists(tag, ATTR_HBORDER))
w = BORDER_NOWIN;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15600,7 +16315,7 @@ index 567d41e..9b0e947 100644
</span> #ifdef ID_EXT
parsedtag_get_value(tag, ATTR_ID, &id);
#endif /* ID_EXT */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4970,6 +5115,16 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4970,6 +5117,16 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> case HTML_INPUT:
close_anchor(h_env, obuf);
tmp = process_input(tag);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15617,7 +16332,7 @@ index 567d41e..9b0e947 100644
</span> if (tmp)
HTMLlineproc1(tmp->ptr, h_env);
return 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5067,11 +5222,10 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5067,11 +5224,10 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
</span> }
return 1;
case HTML_BASE:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15631,7 +16346,7 @@ index 567d41e..9b0e947 100644
</span> parseURL(p, cur_baseURL, NULL);
}
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5329,6 +5483,13 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5329,6 +5485,13 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> #ifdef MENU_SELECT
Anchor **a_select = NULL;
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15645,7 +16360,7 @@ index 567d41e..9b0e947 100644
</span>
if (out_size == 0) {
out_size = LINELEN;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5523,16 +5684,17 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5523,16 +5686,17 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> hseq = 0;
id = NULL;
if (parsedtag_get_value(tag, ATTR_NAME, &id)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15667,7 +16382,7 @@ index 567d41e..9b0e947 100644
</span> parsedtag_get_value(tag, ATTR_TITLE, &s);
parsedtag_get_value(tag, ATTR_ACCESSKEY, &t);
parsedtag_get_value(tag, ATTR_HSEQ, &hseq);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5571,7 +5733,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5571,7 +5735,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> a_href->end.pos = pos;
if (a_href->start.line == a_href->end.line &&
a_href->start.pos == a_href->end.pos) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15676,7 +16391,7 @@ index 567d41e..9b0e947 100644
</span> a_href->hseq < buf->hmarklist->nmark)
buf->hmarklist->marks[a_href->hseq].invalid = 1;
a_href->hseq = -1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5618,7 +5780,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5618,7 +5782,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> ParsedURL u;
Image *image;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15685,7 +16400,7 @@ index 567d41e..9b0e947 100644
</span> a_img->image = image = New(Image);
image->url = parsedURL2Str(&u)->ptr;
if (!uncompressed_file_type(u.file, &image->ext))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5639,7 +5801,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5639,7 +5803,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> image->map = q;
image->ismap = ismap;
image->touch = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15694,7 +16409,7 @@ index 567d41e..9b0e947 100644
</span> IMG_FLAG_SKIP);
}
else if (iseq < 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5678,7 +5840,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5678,7 +5842,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> parsedtag_get_value(tag, ATTR_FID, &form_id);
parsedtag_get_value(tag, ATTR_TOP_MARGIN, &top);
parsedtag_get_value(tag, ATTR_BOTTOM_MARGIN, &bottom);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15704,7 +16419,7 @@ index 567d41e..9b0e947 100644
</span> break; /* outside of <form>..</form> */
form = forms[form_id];
if (hseq > 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5689,6 +5852,21 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5689,6 +5854,21 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> putHmarker(buf->hmarklist, currentLn(buf),
hpos, hseq - 1);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15726,7 +16441,7 @@ index 567d41e..9b0e947 100644
</span> if (!form->target)
form->target = buf->baseTarget;
if (a_textarea &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5761,8 +5939,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5761,8 +5941,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> break;
if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
MapArea *a;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15737,7 +16452,7 @@ index 567d41e..9b0e947 100644
</span> t = NULL;
parsedtag_get_value(tag, ATTR_TARGET, &t);
q = "";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5811,11 +5989,14 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5811,11 +5991,14 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> break;
case HTML_BASE:
if (parsedtag_get_value(tag, ATTR_HREF, &p)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15755,7 +16470,7 @@ index 567d41e..9b0e947 100644
</span> }
if (parsedtag_get_value(tag, ATTR_TARGET, &p))
buf->baseTarget =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5830,8 +6011,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5830,8 +6013,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> int refresh_interval = getMetaRefreshParam(q, &tmp);
#ifdef USE_ALARM
if (tmp) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15766,7 +16481,7 @@ index 567d41e..9b0e947 100644
</span> buf->event = setAlarmEvent(buf->event,
refresh_interval,
AL_IMPLICIT_ONCE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5844,8 +6025,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5844,8 +6027,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> FUNCNAME_reload, NULL);
#else
if (tmp && refresh_interval == 0) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15777,7 +16492,7 @@ index 567d41e..9b0e947 100644
</span> pushEvent(FUNCNAME_gorURL, p);
}
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5864,14 +6045,14 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5864,14 +6047,14 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> case HTML_TEXTAREA_INT:
if (parsedtag_get_value(tag, ATTR_TEXTAREANUMBER,
&n_textarea)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15794,7 +16509,7 @@ index 567d41e..9b0e947 100644
</span> FormItemList *item =
(FormItemList *)a_textarea[n_textarea]->url;
item->init_value = item->value =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5881,7 +6062,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5881,7 +6064,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> #ifdef MENU_SELECT
case HTML_SELECT_INT:
if (parsedtag_get_value(tag, ATTR_SELECTNUMBER, &n_select)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15803,7 +16518,7 @@ index 567d41e..9b0e947 100644
</span> select_option[n_select].first = NULL;
select_option[n_select].last = NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5889,7 +6070,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5889,7 +6072,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> n_select = -1;
break;
case HTML_N_SELECT_INT:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15812,7 +16527,7 @@ index 567d41e..9b0e947 100644
</span> FormItemList *item =
(FormItemList *)a_select[n_select]->url;
item->select_option = select_option[n_select].first;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5929,7 +6110,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5929,7 +6112,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> #ifdef ID_EXT
id = NULL;
if (parsedtag_get_value(tag, ATTR_ID, &id)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15821,7 +16536,7 @@ index 567d41e..9b0e947 100644
</span> registerName(buf, id, currentLn(buf), pos);
}
if (renderFrameSet &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5964,7 +6145,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5964,7 +6147,8 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
</span> fclose(debug);
#endif
for (form_id = 1; form_id <= form_max; form_id++)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15831,7 +16546,7 @@ index 567d41e..9b0e947 100644
</span> buf->formlist = (form_max >= 0) ? forms[form_max] : NULL;
if (n_textarea)
addMultirowsForm(buf, buf->formitem);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5982,7 +6164,8 @@ addLink(Buffer *buf, struct parsed_tag *tag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5982,7 +6166,8 @@ addLink(Buffer *buf, struct parsed_tag *tag)
</span>
parsedtag_get_value(tag, ATTR_HREF, &href);
if (href)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15841,7 +16556,7 @@ index 567d41e..9b0e947 100644
</span> parsedtag_get_value(tag, ATTR_TITLE, &title);
parsedtag_get_value(tag, ATTR_TYPE, &ctype);
parsedtag_get_value(tag, ATTR_REL, &rel);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6154,10 +6337,10 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6154,10 +6339,10 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> while (*line != '\0') {
char *str, *p;
int is_tag = FALSE;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15856,7 +16571,7 @@ index 567d41e..9b0e947 100644
</span>
if (*line == '<' || obuf->status != R_ST_NORMAL) {
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6173,7 +6356,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6173,7 +6358,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> }
if (h_env->tagbuf->length == 0)
continue;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15865,7 +16580,7 @@ index 567d41e..9b0e947 100644
</span> if (*str == '<') {
if (str[1] && REALLY_THE_BEGINNING_OF_A_TAG(str))
is_tag = TRUE;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6239,7 +6422,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6239,7 +6424,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> }
proc_normal:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15874,7 +16589,7 @@ index 567d41e..9b0e947 100644
</span> /*
* within table: in <table>..</table>, all input tokens
* are fed to the table renderer, and then the renderer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6255,6 +6438,8 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6255,6 +6440,8 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> if (obuf->table_level >= 0) {
struct table *tbl0 = tables[obuf->table_level];
str = Sprintf("<table_alt tid=%d>", tbl0->ntable)->ptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15883,7 +16598,7 @@ index 567d41e..9b0e947 100644
</span> pushTable(tbl0, tbl);
tbl = tbl0;
tbl_mode = &table_mode[obuf->table_level];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6272,6 +6457,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6272,6 +6459,7 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> do_blankline(h_env, obuf, indent, 0, h_env->limit);
}
save_fonteffect(h_env, obuf);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15891,7 +16606,7 @@ index 567d41e..9b0e947 100644
</span> renderTable(tbl, tbl_width, h_env);
restore_fonteffect(h_env, obuf);
obuf->flag &= ~RB_IGNORE_P;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6429,7 +6615,8 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6429,7 +6617,8 @@ HTMLlineproc0(char *line, struct html_feed_environ *h_env, int internal)
</span> indent = h_env->envs[h_env->envc].indent;
if (obuf->bp.pos - i > indent) {
Str line;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15901,7 +16616,7 @@ index 567d41e..9b0e947 100644
</span> line = Strnew_charp(bp);
Strshrink(obuf->line, obuf->line->length - obuf->bp.len);
#ifdef FORMAT_NICE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6756,6 +6943,12 @@ init_henv(struct html_feed_environ *h_env, struct readbuffer *obuf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6756,6 +6945,12 @@ init_henv(struct html_feed_environ *h_env, struct readbuffer *obuf,
</span> obuf->nobr_level = 0;
bzero((void *)&obuf->anchor, sizeof(obuf->anchor));
obuf->img_alt = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15914,7 +16629,7 @@ index 567d41e..9b0e947 100644
</span> obuf->in_bold = 0;
obuf->in_italic = 0;
obuf->in_under = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6791,6 +6984,15 @@ completeHTMLstream(struct html_feed_environ *h_env, struct readbuffer *obuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6791,6 +6986,15 @@ completeHTMLstream(struct html_feed_environ *h_env, struct readbuffer *obuf)
</span> push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT);
obuf->img_alt = NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15930,7 +16645,7 @@ index 567d41e..9b0e947 100644
</span> if (obuf->in_bold) {
push_tag(obuf, "</b>", HTML_N_B);
obuf->in_bold = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6824,9 +7026,12 @@ completeHTMLstream(struct html_feed_environ *h_env, struct readbuffer *obuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6824,9 +7028,12 @@ completeHTMLstream(struct html_feed_environ *h_env, struct readbuffer *obuf)
</span> obuf->table_level = MAX_TABLE - 1;
while (obuf->table_level >= 0) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15943,7 +16658,7 @@ index 567d41e..9b0e947 100644
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6848,6 +7053,8 @@ print_internal_information(struct html_feed_environ *henv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6848,6 +7055,8 @@ print_internal_information(struct html_feed_environ *henv)
</span> if (form_max >= 0) {
FormList *fp;
for (i = 0; i <= form_max; i++) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15952,7 +16667,7 @@ index 567d41e..9b0e947 100644
</span> fp = forms[i];
s = Sprintf("<form_int fid=\"%d\" action=\"%s\" method=\"%s\"",
i, html_quote(fp->action->ptr),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6963,8 +7170,6 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6963,8 +7172,6 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span> image_flag = IMG_FLAG_AUTO;
else
image_flag = IMG_FLAG_SKIP;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15961,7 +16676,7 @@ index 567d41e..9b0e947 100644
</span> #endif
if (w3m_halfload) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6987,6 +7192,9 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6987,6 +7194,9 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span> htmlenv1.f = stdout;
else
htmlenv1.buf = newTextLineList();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15971,7 +16686,7 @@ index 567d41e..9b0e947 100644
</span>
if (SETJMP(AbortLoading) != 0) {
HTMLlineproc1("<br>Transfer Interrupted!<br>", &htmlenv1);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7048,18 +7256,23 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7048,18 +7258,23 @@ loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src, int internal)
</span> }
#endif
lineBuf2 = convertLine(f, lineBuf2, HTML_MODE, &charset, doc_charset);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15997,7 +16712,7 @@ index 567d41e..9b0e947 100644
</span> if (htmlenv1.title)
newBuf->buffername = htmlenv1.title;
if (w3m_halfdump) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7096,16 +7309,17 @@ loadHTMLString(Str page)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7096,16 +7311,17 @@ loadHTMLString(Str page)
</span> MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
Buffer *newBuf;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16017,7 +16732,7 @@ index 567d41e..9b0e947 100644
</span> #ifdef USE_M17N
newBuf->document_charset = InnerCharset;
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7115,6 +7329,7 @@ loadHTMLString(Str page)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7115,6 +7331,7 @@ loadHTMLString(Str page)
</span> #endif
TRAP_OFF;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16025,7 +16740,7 @@ index 567d41e..9b0e947 100644
</span> newBuf->topLine = newBuf->firstLine;
newBuf->lastLine = newBuf->currentLine;
newBuf->currentLine = newBuf->firstLine;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7207,7 +7422,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7207,7 +7424,7 @@ loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset)
</span> q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr,
"/", file->ptr, NULL)->ptr;
Strcat_m_charp(tmp, "<a href=\"",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16034,7 +16749,7 @@ index 567d41e..9b0e947 100644
</span> "\">", p, html_quote(name->ptr + 1), "</a>\n", NULL);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7243,7 +7458,6 @@ loadBuffer(URLFile *uf, Buffer *volatile newBuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7243,7 +7460,6 @@ loadBuffer(URLFile *uf, Buffer *volatile newBuf)
</span>
if (newBuf == NULL)
newBuf = newBuffer(INIT_BUFFER_WIDTH);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16042,7 +16757,7 @@ index 567d41e..9b0e947 100644
</span>
if (SETJMP(AbortLoading) != 0) {
goto _end;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7331,6 +7545,7 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7331,6 +7547,7 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span> URLFile f;
MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
struct stat st;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16050,7 +16765,7 @@ index 567d41e..9b0e947 100644
</span>
loadImage(newBuf, IMG_FLAG_STOP);
image.url = uf->url;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7338,20 +7553,18 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7338,20 +7555,18 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span> image.width = -1;
image.height = -1;
image.cache = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16074,7 +16789,13 @@ index 567d41e..9b0e947 100644
</span> TRAP_OFF;
cache->loaded = IMG_FLAG_LOADED;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7371,6 +7584,7 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7367,10 +7582,13 @@ loadImageBuffer(URLFile *uf, Buffer *newBuf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp = Sprintf("<img src=\"%s\"><br><br>", html_quote(image.url));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpf = tmpfname(TMPF_SRC, ".html");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src = fopen(tmpf->ptr, "w");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (src == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ newBuf->mailcap_source = tmpf->ptr;
</span>
init_stream(&f, SCM_LOCAL, newStrStream(tmp));
loadHTMLstream(&f, newBuf, src, TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16082,7 +16803,7 @@ index 567d41e..9b0e947 100644
</span> if (src)
fclose(src);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7411,7 +7625,7 @@ conv_symbol(Line *l)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7411,7 +7629,7 @@ conv_symbol(Line *l)
</span> symbol = get_symbol(DisplayCharset, &w);
#endif
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16091,7 +16812,7 @@ index 567d41e..9b0e947 100644
</span> #ifdef USE_M17N
p += len - 1;
pr += len - 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7580,8 +7794,11 @@ openGeneralPagerBuffer(InputStream stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7580,8 +7798,11 @@ openGeneralPagerBuffer(InputStream stream)
</span> #ifdef USE_M17N
content_charset = 0;
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16104,7 +16825,7 @@ index 567d41e..9b0e947 100644
</span> readHeader(&uf, t_buf, TRUE, NULL);
t = checkContentType(t_buf);
if (t == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7609,14 +7826,13 @@ openGeneralPagerBuffer(InputStream stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7609,14 +7830,13 @@ openGeneralPagerBuffer(InputStream stream)
</span> #ifdef USE_IMAGE
else if (activeImage && displayImage && !useExtImageViewer &&
!(w3m_dump & ~DUMP_FRAME) && !strncasecmp(t, "image/", 6)) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16121,7 +16842,7 @@ index 567d41e..9b0e947 100644
</span> UFclose(&uf);
if (buf == NULL || buf == NO_BUFFER)
return buf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7629,8 +7845,6 @@ openGeneralPagerBuffer(InputStream stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7629,8 +7849,6 @@ openGeneralPagerBuffer(InputStream stream)
</span> }
}
buf->real_type = t;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16130,7 +16851,7 @@ index 567d41e..9b0e947 100644
</span> return buf;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7766,6 +7980,8 @@ save2tmp(URLFile uf, char *tmpf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7766,6 +7984,8 @@ save2tmp(URLFile uf, char *tmpf)
</span> clen_t linelen = 0, trbyte = 0;
MySignalHandler(*volatile prevtrap) (SIGNAL_ARG) = NULL;
static JMP_BUF env_bak;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16139,7 +16860,7 @@ index 567d41e..9b0e947 100644
</span>
ff = fopen(tmpf, "wb");
if (ff == NULL) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7802,30 +8018,29 @@ save2tmp(URLFile uf, char *tmpf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7802,30 +8022,29 @@ save2tmp(URLFile uf, char *tmpf)
</span> else
#endif /* USE_NNTP */
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16182,7 +16903,7 @@ index 567d41e..9b0e947 100644
</span> {
Str tmpf, command;
struct mailcap *mcap;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7834,7 +8049,7 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7834,7 +8053,7 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span> char *header, *src = NULL, *ext = uf.ext;
if (!(mcap = searchExtViewer(type)))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16191,7 +16912,7 @@ index 567d41e..9b0e947 100644
</span>
if (mcap->nametemplate) {
tmpf = unquote_mailcap(mcap->nametemplate, NULL, "", NULL, NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7867,15 +8082,13 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7867,15 +8086,13 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span> UFclose(&uf);
myExec(command->ptr);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16209,7 +16930,7 @@ index 567d41e..9b0e947 100644
</span> }
}
if (mcap->flags & (MAILCAP_HTMLOUTPUT | MAILCAP_COPIOUSOUTPUT)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7918,14 +8131,13 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7918,14 +8135,13 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
</span> buf = NO_BUFFER;
}
if (buf && buf != NO_BUFFER) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16228,7 +16949,7 @@ index 567d41e..9b0e947 100644
</span> }
static int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7935,7 +8147,8 @@ _MoveFile(char *path1, char *path2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7935,7 +8151,8 @@ _MoveFile(char *path1, char *path2)
</span> FILE *f2;
int is_pipe;
clen_t linelen = 0, trbyte = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16238,7 +16959,7 @@ index 567d41e..9b0e947 100644
</span>
f1 = openIS(path1);
if (f1 == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7953,12 +8166,13 @@ _MoveFile(char *path1, char *path2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7953,12 +8170,13 @@ _MoveFile(char *path1, char *path2)
</span> return -1;
}
current_content_length = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16256,7 +16977,7 @@ index 567d41e..9b0e947 100644
</span> ISclose(f1);
if (is_pipe)
pclose(f2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7998,7 +8212,7 @@ _doFileCopy(char *tmpf, char *defstr, int download)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7998,7 +8216,7 @@ _doFileCopy(char *tmpf, char *defstr, int download)
</span> else {
if (q) {
p = unescape_spaces(Strnew_charp(q))->ptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16265,7 +16986,7 @@ index 567d41e..9b0e947 100644
</span> }
p = expandPath(p);
if (checkOverWrite(p) < 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8317,21 +8531,23 @@ uncompress_stream(URLFile *uf, char **src)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8317,21 +8535,23 @@ uncompress_stream(URLFile *uf, char **src)
</span> }
if (pid2 == 0) {
/* child2 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16294,7 +17015,7 @@ index 567d41e..9b0e947 100644
</span> exit(0);
}
/* child1 */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8378,7 +8594,7 @@ lessopen_stream(char *path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8378,7 +8598,7 @@ lessopen_stream(char *path)
</span> }
c = getc(fp);
if (c == EOF) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17654,7 +18375,7 @@ index b3819a3..2809832 100644
</span>
#endif /* INDEP_H */
diff --git a/istream.c b/istream.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8967280..1387307 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8967280..74adac5 100644
</span> --- a/istream.c
+++ istream.c
@@ -22,8 +22,8 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17863,11 +18584,7 @@ index 8967280..1387307 100644
</span> - if (sb->buf[sb->cur] == '\n')
- Strcat_char(s, (char)sb->buf[sb->cur++]);
- return s;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (crnl && gb->length > 0 && gb->ptr[gb->length - 1] == '\r') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sb->buf[sb->cur] == '\n') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GROWBUF_ADD_CHAR(gb, '\n');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ++sb->cur;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span> - for (i = sb->cur;
- i < sb->next && sb->buf[i] != '\n' && sb->buf[i] != '\r';
- i++) ;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17879,7 +18596,11 @@ index 8967280..1387307 100644
</span> - sb->cur = i + 1;
- if (sb->buf[i] == '\n')
- return s;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (crnl && gb->length > 0 && gb->ptr[gb->length - 1] == '\r') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sb->buf[sb->cur] == '\n') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GROWBUF_ADD_CHAR(gb, '\n');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++sb->cur;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> - else {
- if (s == NULL)
- s = Strnew_size(sb->next - sb->cur + MARGIN_STR_SIZE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17964,7 +18685,19 @@ index 8967280..1387307 100644
</span> }
int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,8 +475,6 @@ ssl_check_cert_ident(X509 * x, char *hostname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,7 +421,11 @@ ssl_check_cert_ident(X509 * x, char *hostname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < n; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gn = sk_GENERAL_NAME_value(alt, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gn->type == GEN_DNS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *sn = ASN1_STRING_data(gn->d.ia5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *sn = ASN1_STRING_get0_data(gn->d.ia5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int sl = ASN1_STRING_length(gn->d.ia5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!seen_dnsname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,8 +479,6 @@ ssl_check_cert_ident(X509 * x, char *hostname)
</span> /* FIXME: gettextize? */
ret = Sprintf("Bad cert ident %s from %s", buf, hostname);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17973,7 +18706,7 @@ index 8967280..1387307 100644
</span> }
return ret;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -645,6 +622,7 @@ basic_close(int *handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -645,6 +626,7 @@ basic_close(int *handle)
</span> #else
close(*(int *)handle);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17981,7 +18714,7 @@ index 8967280..1387307 100644
</span> }
static int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -658,13 +636,14 @@ basic_read(int *handle, char *buf, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -658,13 +640,14 @@ basic_read(int *handle, char *buf, int len)
</span> }
static void
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17998,7 +18731,7 @@ index 8967280..1387307 100644
</span> {
return fread(buf, 1, len, handle->f);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,6 +661,7 @@ ssl_close(struct ssl_handle *handle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -682,6 +665,7 @@ ssl_close(struct ssl_handle *handle)
</span> close(handle->sock);
if (handle->ssl)
SSL_free(handle->ssl);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18006,7 +18739,7 @@ index 8967280..1387307 100644
</span> }
static int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -717,38 +697,60 @@ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -717,38 +701,60 @@ static void
</span> ens_close(struct ens_handle *handle)
{
ISclose(handle->is);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19070,7 +19803,7 @@ index b7e81b6..d8f9023 100644
</span> }
else {
diff --git a/local.c b/local.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f5a73a2..46ac579 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f5a73a2..56d589d 100644
</span> --- a/local.c
+++ local.c
@@ -109,6 +109,7 @@ loadLocalDir(char *dname)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19160,12 +19893,15 @@ index f5a73a2..46ac579 100644
</span> set_cgi_environ(name, file, uri);
if (path_info)
set_environ("PATH_INFO", path_info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -415,12 +426,11 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -415,12 +426,14 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer)
</span> }
#ifdef HAVE_CHDIR /* ifndef __EMX__ ? */
- chdir(mydirname(file));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ chdir(cgi_dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (chdir(cgi_dir) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "failed to chdir to %s: %s\n", cgi_dir, strerror(errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> #endif
- execl(file, mybasename(file), NULL);
+ execl(file, cgi_basename, NULL);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21313,9 +22049,18 @@ index 1489115..ddd267b 100644
</span> -ja
+ja de zh_CN zh_TW
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 83d8838..ef8bd94 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83d8838..9d9691e 100644
</span> --- a/po/Makefile.in.in
+++ po/Makefile.in.in
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@ CATALOGS = @CATALOGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @lang=`echo $* | sed -e 's,.*/,,'`; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && if [ x$(GMSGFMT) != x: ] ; then mv t-$${lang}.gmo $${lang}.gmo ; fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .sin.sed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e '/^#/d' $< > t-$@
</span> @@ -153,14 +153,14 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27451,7 +28196,7 @@ index 569e2fc..ad1cffe 100644
</span> > $(distdir)/w3mman.tar.gz
-rm -fr $(distdir)/w3mman
diff --git a/scripts/w3mman/w3mman.1.in b/scripts/w3mman/w3mman.1.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1c0361d..8c433a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1c0361d..68e3afc 100644
</span> --- a/scripts/w3mman/w3mman.1.in
+++ scripts/w3mman/w3mman.1.in
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27460,7 +28205,7 @@ index 1c0361d..8c433a7 100644
</span> .\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,36 +12,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,36 +12,54 @@
</span> .\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27475,9 +28220,9 @@ index 1c0361d..8c433a7 100644
</span> -.RI "[-M " path ] " " [ section ] " page"
+[
+.BI \-M " path"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+] [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++] [ [
</span> +.I section
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+] [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++]
</span> +.I page
+]
.br
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27485,6 +28230,8 @@ index 1c0361d..8c433a7 100644
</span> -.RI "[-M " path "] -k " keyword
+[
+.BI \-M " path"
<span style='display:block; white-space:pre;background:#e0ffe0;'>++] [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.I section
</span> +]
+.BI \-k " keyword"
.br
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27525,7 +28272,7 @@ index 1c0361d..8c433a7 100644
</span> .TP
.B W3MMAN_W3M
If W3MMAN_W3M is set, its value is used instead of @W3M@.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +67,7 @@ If W3MMAN_MAN is set, its value is used instead of @MAN@.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +69,7 @@ If W3MMAN_MAN is set, its value is used instead of @MAN@.
</span> .SH FILES
.TP
.I @libexecdir@/@PACKAGE@/cgi-bin/w3mman2html.cgi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27611,19 +28358,92 @@ index 0000000..d6c5a44
</span> +Markus Hiereth
+.UE
+erstellt.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/scripts/w3mman/w3mman.in b/scripts/w3mman/w3mman.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6a27e70..fae7a41 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/scripts/w3mman/w3mman.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/w3mman/w3mman.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sub usage {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ($_ = $0) =~ s@.*/@@;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print STDERR "$_ [-M <path>] [[<section>] <command>]\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print STDERR "$_ [-M <path>] [-k <keyword>]\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print STDERR "$_ [-M <path>] [<section>] [-k <keyword>]\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print STDERR "$_ [-l <file>]\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,8 @@ while (@ARGV) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $ENV{'MANPATH'} = shift @ARGV;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elsif (/^-k$/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ARGV || &usage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $query = "?keyword=" . &form_encode(shift @ARGV);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( $query eq "" ) { $query = "?quit=ok"; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $query .= "&keyword=" . &form_encode(shift @ARGV);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elsif (/^-l$/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ARGV || &usage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $query = "?quit=ok&local=" . &form_encode(shift @ARGV);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,11 +29,11 @@ while (@ARGV) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elsif (/^-/) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &usage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elsif (/^\d/ || $_ eq 'n') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @ARGV || &usage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $query = "?quit=ok&man=" . &form_encode(shift @ARGV);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( $query eq "" ) { $query = "?quit=ok"; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $query .= "§ion=" . &form_encode($_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $query = "?quit=ok&man=" . &form_encode($_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ( $query eq "" ) { $query = "?quit=ok"; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $query .= "&man=" . &form_encode($_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/scripts/w3mman/w3mman2html.cgi.in b/scripts/w3mman/w3mman2html.cgi.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f430307..2cd00f9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f430307..d660681 100644
</span> --- a/scripts/w3mman/w3mman2html.cgi.in
+++ scripts/w3mman/w3mman2html.cgi.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,6 @@ Content-Type: text/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,18 +23,23 @@ if ((! $query{"man"}) && (! $query{"local"})) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ($query{"keyword"}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $keyword = $query{"keyword"};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $k = &html_quote($keyword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ($query{"section"}) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $section = $query{"section"};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $sectionopt = "-s $section ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $sectionopt = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print <<EOF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Content-Type: text/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <html>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<head><title>man -k $k</title></head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<head><title>man $sectionopt-k $k</title></head>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <body>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<h2>man -k <b>$k</b></h2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<h2>man $sectionopt-k <b>$k</b></h2>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <ul>
</span> EOF
$keyword =~ s:([^-\w\200-\377.,])::g;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- open(F, "$MAN -k $keyword 2> /dev/null |");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- open(F, "$MAN -k $keyword 2> /dev/null |");
</span> - @line = ();
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ open(F, "$MAN $sectionopt -k $keyword 2> /dev/null |");
</span> while(<F>) {
chop;
$_ = &html_quote($_);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,12 +125,14 @@ while(<F>) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,10 +64,10 @@ Content-Type: text/html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <body>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <form action="$CGI">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <table>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<tr><td>Manual:<td><input name=man>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<tr><td>Section:<td><input name=section>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<tr><td>Keyword:<td><input name=keyword>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-<tr><td><td><input type=submit> <input type=reset>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<tr><td>Manual:<td><input name=man />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<tr><td>Section:<td><input name=section />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<tr><td>Keyword:<td><input name=keyword />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++<tr><td><td><input type=submit /> <input type=reset />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </table>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </form>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </body>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,12 +131,14 @@ while(<F>) {
</span> s/\&/\&/g;
s/\</\</g;
s/\>/\>/g;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27641,7 +28461,7 @@ index f430307..2cd00f9 100644
</span> s@((\<b\>)?(\&\w+\;|.)(\</b\>)?)\010_@<u>$1</u>@g;
s@.\010(.)@$1@g;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,7 +157,7 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,7 +163,7 @@ EOF
</span> }
s@(http|ftp)://[\w.\-/~]+[\w/]@<a href="$&">$&</a>@g;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27650,7 +28470,7 @@ index f430307..2cd00f9 100644
</span> 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.\-]*)(\</[bu]\>)*(\([\dm]\w*\))@) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,7 +221,7 @@ sub is_command {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,7 +227,7 @@ sub is_command {
</span> local($p);
(! -d && -x) || return 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27677,7 +28497,7 @@ index 50475ae..c047c56 100644
</span> buf[i] = (*p == ' ') ? NBSP_CODE : *p;
diff --git a/table.c b/table.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e1243ff..4f193e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e1243ff..eb5c9ba 100644
</span> --- a/table.c
+++ table.c
@@ -188,7 +188,7 @@ dv2sv(double *dv, short *iv, int size)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27784,7 +28604,17 @@ index e1243ff..4f193e1 100644
</span> check_maximum_width(t);
#ifdef MATRIX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2323,6 +2341,8 @@ feed_table_block_tag(struct table *tbl,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2272,7 +2290,8 @@ skip_space(struct table *t, char *line, struct table_linfo *linfo,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (s > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_M17N
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ctype == PC_KANJI1 && prev_ctype == PC_KANJI1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!SimplePreserveSpace &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ctype == PC_KANJI1 && prev_ctype == PC_KANJI1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skip += s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2323,6 +2342,8 @@ feed_table_block_tag(struct table *tbl,
</span> int offset;
if (mode->indent_level <= 0 && indent == -1)
return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27793,7 +28623,7 @@ index e1243ff..4f193e1 100644
</span> setwidth(tbl, mode);
feed_table_inline_tag(tbl, line, mode, -1);
clearcontentssize(tbl, mode);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2336,10 +2356,14 @@ feed_table_block_tag(struct table *tbl,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2336,10 +2357,14 @@ feed_table_block_tag(struct table *tbl,
</span> if (mode->indent_level < MAX_INDENT_LEVEL)
tbl->indent -= INDENT_INCR;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27808,7 +28638,7 @@ index e1243ff..4f193e1 100644
</span> }
if (tbl->indent > 0) {
check_minimum0(tbl, 0);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2546,8 +2570,10 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2546,8 +2571,10 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span> }
}
#ifdef ID_EXT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27820,7 +28650,7 @@ index e1243ff..4f193e1 100644
</span> #endif /* ID_EXT */
tbl->trattr = align | valign;
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2572,7 +2598,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2572,7 +2599,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span> }
tbl->col++;
check_row(tbl, tbl->row);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27829,7 +28659,7 @@ index e1243ff..4f193e1 100644
</span> tbl->col++;
}
if (tbl->col > MAXCOL - 1) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2600,12 +2626,16 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2600,12 +2627,16 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span> if ((tbl->row + rowspan) >= tbl->max_rowsize)
check_row(tbl, tbl->row + rowspan);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27846,7 +28676,7 @@ index e1243ff..4f193e1 100644
</span> if (parsedtag_get_value(tag, ATTR_ALIGN, &i)) {
switch (i) {
case ALIGN_LEFT:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2878,6 +2908,14 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2878,6 +2909,14 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span> tmp = process_input(tag);
feed_table1(tbl, tmp, mode, width);
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27861,7 +28691,7 @@ index e1243ff..4f193e1 100644
</span> case HTML_SELECT:
tmp = process_select(tag);
if (tmp)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3010,7 +3048,6 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3010,7 +3049,6 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
</span> break;
case HTML_TABLE_ALT:
id = -1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28273,7 +29103,7 @@ index 7a3c987..a636ac0 100644
</span> #define CYGWIN_OFF {fputs("\033[?1000l",ttyf); flush_tty();}
diff --git a/url.c b/url.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed6062e..d759383 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed6062e..1c17e18 100644
</span> --- a/url.c
+++ url.c
@@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28284,15 +29114,28 @@ index ed6062e..d759383 100644
</span>
/* #define HTTP_DEFAULT_FILE "/index.html" */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,6 +327,7 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,14 +319,19 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* defined(USE_SSL_VERIFY) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ssl_ctx == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int option;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if SSLEAY_VERSION_NUMBER < 0x0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OPENSSL_VERSION_NUMBER < 0x0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssl_ctx = SSL_CTX_new();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509_set_default_verify_paths(ssl_ctx->cert);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* SSLEAY_VERSION_NUMBER >= 0x0800 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SSLeay_add_ssl_algorithms();
</span> SSL_load_error_strings();
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OPENSSL_init_ssl(0, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span> 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'))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,8 +338,20 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,8 +342,20 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
</span> option |= SSL_OP_NO_TLSv1;
if (strchr(ssl_forbid_method, 'T'))
option |= SSL_OP_NO_TLSv1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28313,7 +29156,7 @@ index ed6062e..d759383 100644
</span> #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 */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -444,6 +458,8 @@ baseURL(Buffer *buf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,6 +462,8 @@ baseURL(Buffer *buf)
</span> /* <BASE> tag is defined in the document */
return buf->baseURL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28322,7 +29165,7 @@ index ed6062e..d759383 100644
</span> else
return &buf->currentURL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -638,16 +654,21 @@ openSocket(char *const hostname,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -638,16 +658,21 @@ openSocket(char *const hostname,
</span> #define COPYPATH_SPC_ALLOW 0
#define COPYPATH_SPC_IGNORE 1
#define COPYPATH_SPC_REPLACE 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28348,7 +29191,7 @@ index ed6062e..d759383 100644
</span> break;
case COPYPATH_SPC_IGNORE:
/* do nothing */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -658,7 +679,7 @@ copyPath(char *orgpath, int length, int option)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -658,7 +683,7 @@ copyPath(char *orgpath, int length, int option)
</span> }
}
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28357,7 +29200,7 @@ index ed6062e..d759383 100644
</span> orgpath++;
length--;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -668,22 +689,14 @@ copyPath(char *orgpath, int length, int option)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -668,22 +693,14 @@ copyPath(char *orgpath, int length, int option)
</span> void
parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28382,7 +29225,7 @@ index ed6062e..d759383 100644
</span>
/* RFC1808: Relative Uniform Resource Locators
* 4. Resolving Relative URLs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,7 +707,7 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,7 +711,7 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> goto do_label;
}
#if defined( __EMX__ ) || defined( __CYGWIN__ )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28391,7 +29234,7 @@ index ed6062e..d759383 100644
</span> p_url->scheme = SCM_LOCAL;
p += 17 - 1;
url += 17 - 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -802,19 +815,20 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -802,19 +819,20 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> /* scheme://user:pass@host or
* scheme://host:port
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28416,7 +29259,7 @@ index ed6062e..d759383 100644
</span> tmp = Strnew_charp_n(q, p - q);
p_url->port = atoi(tmp->ptr);
/* *p is one of ['\0', '/', '?', '#'] */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -822,15 +836,19 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -822,15 +840,19 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> case '@':
/* scheme://user@... */
p_url->user = copyPath(q, p - q, COPYPATH_SPC_IGNORE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28439,7 +29282,7 @@ index ed6062e..d759383 100644
</span> break;
}
analyze_file:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -956,12 +974,16 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -956,12 +978,16 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
</span> p_url->label = NULL;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28458,7 +29301,7 @@ index ed6062e..d759383 100644
</span> p->scheme = q->scheme;
p->port = q->port;
p->is_nocache = q->is_nocache;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1279,10 +1301,24 @@ getURLScheme(char **url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1279,10 +1305,24 @@ getURLScheme(char **url)
</span> return scheme;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28483,7 +29326,7 @@ index ed6062e..d759383 100644
</span>
Strcat_charp(s, "User-Agent: ");
if (UserAgent == NULL || *UserAgent == '\0')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,7 +1342,12 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1306,7 +1346,12 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span> Strcat_charp(s, "Pragma: no-cache\r\n");
Strcat_charp(s, "Cache-control: no-cache\r\n");
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28497,7 +29340,7 @@ index ed6062e..d759383 100644
</span> #ifdef USE_SSL
if (current && current->scheme == SCM_HTTPS && target->scheme != SCM_HTTPS) {
/* Don't send Referer: if https:// -> http:// */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1314,6 +1355,7 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1314,6 +1359,7 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
</span> else
#endif
if (referer == NULL && current && current->scheme != SCM_LOCAL &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28505,7 +29348,7 @@ index ed6062e..d759383 100644
</span> (current->scheme != SCM_FTP ||
(current->user == NULL && current->pass == NULL))) {
char *p = current->label;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1384,7 +1426,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1384,7 +1430,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> {
Str tmp;
TextListItem *i;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28513,7 +29356,7 @@ index ed6062e..d759383 100644
</span> #ifdef USE_COOKIE
Str cookie;
#endif /* USE_COOKIE */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1400,7 +1441,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1400,7 +1445,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> for (i = extra->first; i != NULL; i = i->next) {
if (strncasecmp(i->ptr, "Authorization:",
sizeof("Authorization:") - 1) == 0) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28521,7 +29364,7 @@ index ed6062e..d759383 100644
</span> #ifdef USE_SSL
if (hr->command == HR_COMMAND_CONNECT)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1430,20 +1470,20 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1430,20 +1474,20 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
</span> #endif /* USE_COOKIE */
if (hr->command == HR_COMMAND_POST) {
if (hr->request->enctype == FORM_ENCTYPE_MULTIPART) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28546,7 +29389,7 @@ index ed6062e..d759383 100644
</span> if (header_string)
Strcat(tmp, header_string);
Strcat_charp(tmp, "\r\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1603,7 +1643,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1603,7 +1647,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> pu->host != NULL && !check_no_proxy(pu->host)) {
hr->flag |= HR_FLAG_PROXY;
sock = openSocket(FTP_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28555,7 +29398,7 @@ index ed6062e..d759383 100644
</span> FTP_proxy_parsed.port);
if (sock < 0)
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1645,15 +1685,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1645,15 +1689,15 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> }
else if (pu->scheme == SCM_HTTPS) {
sock = openSocket(HTTPS_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28575,7 +29418,7 @@ index ed6062e..d759383 100644
</span> #ifdef USE_SSL
sslh = NULL;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1685,8 +1725,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1685,8 +1729,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> }
}
else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28585,7 +29428,25 @@ index ed6062e..d759383 100644
</span> if (sock < 0) {
*status = HTST_MISSING;
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1750,7 +1789,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1713,6 +1756,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write(sock, tmp->ptr, tmp->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(w3m_reqlog){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *ff = fopen(w3m_reqlog, "a");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ff == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return uf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sslh)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fputs("HTTPS: request via SSL\n", ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1735,6 +1780,8 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write(sock, tmp->ptr, tmp->length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(w3m_reqlog){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *ff = fopen(w3m_reqlog, "a");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ff == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return uf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fwrite(tmp->ptr, sizeof(char), tmp->length, ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(ff);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1750,7 +1797,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> pu->host != NULL && !check_no_proxy(pu->host)) {
hr->flag |= HR_FLAG_PROXY;
sock = openSocket(GOPHER_proxy_parsed.host,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28594,7 +29455,7 @@ index ed6062e..d759383 100644
</span> GOPHER_proxy_parsed.port);
if (sock < 0)
return uf;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1758,8 +1797,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1758,8 +1805,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
</span> tmp = HTTPrequest(pu, current, hr, extra_header);
}
else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28604,7 +29465,7 @@ index ed6062e..d759383 100644
</span> if (sock < 0)
return uf;
if (pu->file == NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2049,7 +2087,7 @@ filename_extension(char *path, int is_url)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2049,7 +2095,7 @@ filename_extension(char *path, int is_url)
</span> break;
}
if (*last_dot == '.') {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28613,7 +29474,7 @@ index ed6062e..d759383 100644
</span> if (is_url && !IS_ALNUM(last_dot[i]))
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2234,3 +2272,66 @@ schemeToProxy(int scheme)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2234,3 +2280,66 @@ schemeToProxy(int scheme)
</span> }
return pu;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29735,6 +30596,18 @@ index 36e3b62..f1e8d97 100644
</span> #endif
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "fb.h"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea36637..1a5151c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/w3mimg/fb/fb_imlib2.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ w3mimg/fb/fb_imlib2.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fb_imlib2.c 0.3 Copyright (C) 2002, hito
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Imlib2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fb.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fb_img.h"
</span> diff --git a/w3mimg/fb/fb_w3mimg.c b/w3mimg/fb/fb_w3mimg.c
index d3ae5a9..62511f0 100644
--- a/w3mimg/fb/fb_w3mimg.c
</pre><pre style='margin:0'>
</pre>